Replace "gint" with "int"
authorBenjamin Otte <otte@redhat.com>
Fri, 24 Jul 2020 13:54:49 +0000 (15:54 +0200)
committerBenjamin Otte <otte@redhat.com>
Fri, 24 Jul 2020 22:47:36 +0000 (00:47 +0200)
628 files changed:
demos/constraint-editor/constraint-editor-application.c
demos/constraint-editor/constraint-editor-window.c
demos/gtk-demo/application.c
demos/gtk-demo/assistant.c
demos/gtk-demo/combobox.c
demos/gtk-demo/css_blendmodes.c
demos/gtk-demo/dialog.c
demos/gtk-demo/editable_cells.c
demos/gtk-demo/expander.c
demos/gtk-demo/filtermodel.c
demos/gtk-demo/flowbox.c
demos/gtk-demo/font_features.c
demos/gtk-demo/fontplane.c
demos/gtk-demo/gtkfishbowl.c
demos/gtk-demo/hypertext.c
demos/gtk-demo/iconview.c
demos/gtk-demo/iconview_edit.c
demos/gtk-demo/images.c
demos/gtk-demo/infobar.c
demos/gtk-demo/links.c
demos/gtk-demo/list_store.c
demos/gtk-demo/main.c
demos/gtk-demo/overlay2.c
demos/gtk-demo/pagesetup.c
demos/gtk-demo/paint.c
demos/gtk-demo/pixbufs.c
demos/gtk-demo/printing.c
demos/gtk-demo/revealer.c
demos/gtk-demo/search_entry.c
demos/gtk-demo/spinbutton.c
demos/gtk-demo/tree_store.c
demos/icon-browser/iconbrowserwin.c
demos/node-editor/node-editor-application.c
demos/node-editor/node-editor-window.c
demos/print-editor/print-editor.c
demos/widget-factory/widget-factory.c
docs/CODING-STYLE.md
docs/reference/gtk/getting_started.md
docs/tools/shooter.c
examples/application1/exampleapp.c
examples/application2/exampleapp.c
examples/application3/exampleapp.c
examples/application4/exampleapp.c
examples/application5/exampleapp.c
examples/application6/exampleapp.c
examples/application7/exampleapp.c
examples/application8/exampleapp.c
examples/application9/exampleapp.c
examples/bp/bloatpad.c
examples/plugman.c
examples/search-bar.c
examples/sunny.c
gdk/broadway/broadway-output.c
gdk/broadway/broadway-server.c
gdk/broadway/broadway-server.h
gdk/broadway/gdkbroadway-server.c
gdk/broadway/gdkbroadway-server.h
gdk/broadway/gdkeventsource.c
gdk/broadway/gdkkeys-broadway.c
gdk/broadway/gdkprivate-broadway.h
gdk/broadway/gdksurface-broadway.c
gdk/gdk.c
gdk/gdkapplaunchcontext.c
gdk/gdkapplaunchcontext.h
gdk/gdkapplaunchcontextprivate.h
gdk/gdkcairo.c
gdk/gdkdevice.c
gdk/gdkdevice.h
gdk/gdkdevicepad.c
gdk/gdkdevicepad.h
gdk/gdkdevicepadprivate.h
gdk/gdkdeviceprivate.h
gdk/gdkdisplaymanager.c
gdk/gdkdrag.c
gdk/gdkdrag.h
gdk/gdkdragprivate.h
gdk/gdkevents.c
gdk/gdkframeclock.c
gdk/gdkframeclockidle.c
gdk/gdkinternals.h
gdk/gdkkeys.c
gdk/gdkkeysprivate.h
gdk/gdkpango.c
gdk/gdkpango.h
gdk/gdkpipeiostream.c
gdk/gdkpixbuf-drawable.c
gdk/gdkpixbuf.h
gdk/gdkrectangle.c
gdk/gdksurface.c
gdk/gdksurface.h
gdk/gdksurfaceprivate.h
gdk/gdktypes.h
gdk/macos/GdkMacosWindow.c
gdk/macos/gdkdisplaylinksource.c
gdk/macos/gdkmacosdevice.c
gdk/macos/gdkmacosdisplay-settings.c
gdk/macos/gdkmacosdrag.c
gdk/macos/gdkmacoseventsource.c
gdk/macos/gdkmacoskeymap.c
gdk/macos/gdkmacossurface-private.h
gdk/macos/gdkmacossurface.c
gdk/wayland/gdkcursor-wayland.c
gdk/wayland/gdkdevice-wayland.c
gdk/wayland/gdkdisplay-wayland.c
gdk/wayland/gdkdisplay-wayland.h
gdk/wayland/gdkdrag-wayland.c
gdk/wayland/gdkeventsource.c
gdk/wayland/gdkkeys-wayland.c
gdk/wayland/gdksurface-wayland.c
gdk/wayland/gdkwaylanddisplay.h
gdk/win32/bdfcursor.c
gdk/win32/gdkcairocontext-win32.c
gdk/win32/gdkcairocontext-win32.h
gdk/win32/gdkclipdrop-win32.c
gdk/win32/gdkclipdrop-win32.h
gdk/win32/gdkcursor-win32.c
gdk/win32/gdkdevice-win32.c
gdk/win32/gdkdevice-wintab.c
gdk/win32/gdkdevice-wintab.h
gdk/win32/gdkdevicemanager-win32.c
gdk/win32/gdkdevicemanager-win32.h
gdk/win32/gdkdisplay-win32.c
gdk/win32/gdkdisplay-win32.h
gdk/win32/gdkdrag-win32.c
gdk/win32/gdkdrop-win32.c
gdk/win32/gdkevents-win32.c
gdk/win32/gdkglcontext-win32.c
gdk/win32/gdkglobals-win32.c
gdk/win32/gdkkeys-win32.c
gdk/win32/gdkmain-win32.c
gdk/win32/gdkmonitor-win32.c
gdk/win32/gdkprivate-win32.h
gdk/win32/gdkproperty-win32.c
gdk/win32/gdksurface-win32.c
gdk/win32/gdksurface-win32.h
gdk/win32/gdkwin32display.h
gdk/win32/gdkwin32dnd-private.h
gdk/win32/gdkwin32glcontext.h
gdk/win32/gdkwin32id.c
gdk/win32/gdkwin32langnotification.c
gdk/win32/xcursors.h
gdk/x11/gdkasync.c
gdk/x11/gdkasync.h
gdk/x11/gdkclipboard-x11.c
gdk/x11/gdkcursor-x11.c
gdk/x11/gdkdevice-xi2.c
gdk/x11/gdkdevicemanager-x11.c
gdk/x11/gdkdevicemanager-xi2.c
gdk/x11/gdkdisplay-x11.c
gdk/x11/gdkdisplay-x11.h
gdk/x11/gdkdrag-x11.c
gdk/x11/gdkdrop-x11.c
gdk/x11/gdkeventsource.c
gdk/x11/gdkglcontext-x11.c
gdk/x11/gdkkeys-x11.c
gdk/x11/gdkkeys-x11.h
gdk/x11/gdkmain-x11.c
gdk/x11/gdkprivate-x11.h
gdk/x11/gdkproperty-x11.c
gdk/x11/gdkscreen-x11.c
gdk/x11/gdkscreen-x11.h
gdk/x11/gdkselection-x11.c
gdk/x11/gdkselectioninputstream-x11.c
gdk/x11/gdkselectionoutputstream-x11.c
gdk/x11/gdksurface-x11.c
gdk/x11/gdksurface-x11.h
gdk/x11/gdktextlistconverter-x11.c
gdk/x11/gdkvisual-x11.c
gdk/x11/gdkvisual-x11.h
gdk/x11/gdkx11device.h
gdk/x11/gdkx11devicemanager.h
gdk/x11/gdkx11display.h
gdk/x11/gdkx11glcontext.h
gdk/x11/gdkx11screen.h
gdk/x11/gdkx11selection.h
gdk/x11/gdkxftdefaults.c
gsk/gskrendernodeimpl.c
gsk/vulkan/gskvulkanrenderer.c
gsk/vulkan/gskvulkanrenderpass.c
gtk/a11y/gtkbooleancellaccessible.c
gtk/a11y/gtkbuttonaccessible.c
gtk/a11y/gtkcellaccessible.c
gtk/a11y/gtkcellaccessibleparent.c
gtk/a11y/gtkcellaccessibleparent.h
gtk/a11y/gtkcolorswatchaccessible.c
gtk/a11y/gtkcomboboxaccessible.c
gtk/a11y/gtkcontainercellaccessible.c
gtk/a11y/gtkentryaccessible.c
gtk/a11y/gtkexpanderaccessible.c
gtk/a11y/gtkflowboxaccessible.c
gtk/a11y/gtkiconviewaccessible.c
gtk/a11y/gtkimageaccessible.c
gtk/a11y/gtkimagecellaccessible.c
gtk/a11y/gtklabelaccessible.c
gtk/a11y/gtklinkbuttonaccessible.c
gtk/a11y/gtklistboxaccessible.c
gtk/a11y/gtkmenubuttonaccessible.c
gtk/a11y/gtknotebookaccessible.c
gtk/a11y/gtknotebookpageaccessible.c
gtk/a11y/gtkpanedaccessible.c
gtk/a11y/gtkpasswordentryaccessible.c
gtk/a11y/gtkpictureaccessible.c
gtk/a11y/gtkradiobuttonaccessible.c
gtk/a11y/gtkscalebuttonaccessible.c
gtk/a11y/gtkscrolledwindowaccessible.c
gtk/a11y/gtksearchentryaccessible.c
gtk/a11y/gtkspinneraccessible.c
gtk/a11y/gtkstatusbaraccessible.c
gtk/a11y/gtkswitchaccessible.c
gtk/a11y/gtktextaccessible.c
gtk/a11y/gtktextcellaccessible.c
gtk/a11y/gtktextviewaccessible.c
gtk/a11y/gtktoplevelaccessible.c
gtk/a11y/gtktreeviewaccessible.c
gtk/a11y/gtkwidgetaccessible.c
gtk/a11y/gtkwindowaccessible.c
gtk/css/gtkcsssection.c
gtk/css/gtkcsstokenizer.c
gtk/gen-paper-names.c
gtk/gsettings-mapping.c
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c
gtk/gtkactionhelper.c
gtk/gtkactionmuxer.c
gtk/gtkadjustment.c
gtk/gtkappchooserbutton.c
gtk/gtkappchooserdialog.c
gtk/gtkappchooserwidget.c
gtk/gtkapplication-dbus.c
gtk/gtkapplication-quartz-menu.c
gtk/gtkapplication-quartz.c
gtk/gtkapplication.c
gtk/gtkapplicationwindow.c
gtk/gtkassistant.c
gtk/gtkassistant.h
gtk/gtkbookmarksmanager.c
gtk/gtkbookmarksmanagerprivate.h
gtk/gtkbox.c
gtk/gtkbox.h
gtk/gtkboxlayout.c
gtk/gtkbuildable.h
gtk/gtkbuilder-menus.c
gtk/gtkbuilder.c
gtk/gtkbuilderparser.c
gtk/gtkbuilderprecompile.c
gtk/gtkbuilderprivate.h
gtk/gtkbuilderscope.c
gtk/gtkcalendar.c
gtk/gtkcellarea.c
gtk/gtkcellarea.h
gtk/gtkcellareabox.c
gtk/gtkcellareabox.h
gtk/gtkcellareaboxcontext.c
gtk/gtkcellareaboxcontextprivate.h
gtk/gtkcellareacontext.c
gtk/gtkcellareacontext.h
gtk/gtkcelllayout.c
gtk/gtkcelllayout.h
gtk/gtkcellrenderer.c
gtk/gtkcellrenderer.h
gtk/gtkcellrendereraccel.c
gtk/gtkcellrenderercombo.c
gtk/gtkcellrendererpixbuf.c
gtk/gtkcellrendererprogress.c
gtk/gtkcellrendererspinner.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertext.h
gtk/gtkcellrenderertoggle.c
gtk/gtkcellview.c
gtk/gtkcolorbutton.c
gtk/gtkcolorchooser.c
gtk/gtkcolorchooser.h
gtk/gtkcolorchooserdialog.c
gtk/gtkcolorchooserwidget.c
gtk/gtkcoloreditor.c
gtk/gtkcolorplane.c
gtk/gtkcolorscale.c
gtk/gtkcolorswatch.c
gtk/gtkcombobox.c
gtk/gtkcombobox.h
gtk/gtkcomboboxtext.c
gtk/gtkcomboboxtext.h
gtk/gtkcomposetable.c
gtk/gtkcomposetable.h
gtk/gtkcssanimation.c
gtk/gtkcssimageicontheme.c
gtk/gtkcssimagerecolor.c
gtk/gtkcssnodedeclaration.c
gtk/gtkcssnumbervalue.c
gtk/gtkcssprovider.c
gtk/gtkcssselector.c
gtk/gtkcssstyle.c
gtk/gtkcssvalueprivate.h
gtk/gtkcustompaperunixdialog.c
gtk/gtkdialog.c
gtk/gtkdialog.h
gtk/gtkdragsource.c
gtk/gtkentry.c
gtk/gtkentry.h
gtk/gtkentrybuffer.c
gtk/gtkentrybuffer.h
gtk/gtkentrycompletion.c
gtk/gtkentrycompletion.h
gtk/gtkentryprivate.h
gtk/gtkeventcontrollerscroll.c
gtk/gtkexpander.c
gtk/gtkexpression.c
gtk/gtkfilechooserbutton.c
gtk/gtkfilechooserbutton.h
gtk/gtkfilechooserdialog.c
gtk/gtkfilechooserentry.c
gtk/gtkfilechoosernative.c
gtk/gtkfilechoosernativequartz.c
gtk/gtkfilechoosernativewin32.c
gtk/gtkfilechooserwidget.c
gtk/gtkfilesystemmodel.c
gtk/gtkflowbox.c
gtk/gtkflowbox.h
gtk/gtkfontbutton.c
gtk/gtkfontchooser.c
gtk/gtkfontchooser.h
gtk/gtkfontchooserwidget.c
gtk/gtkframe.c
gtk/gtkgestureclickprivate.h
gtk/gtkgesturelongpress.c
gtk/gtkgesturestylus.c
gtk/gtkgestureswipe.c
gtk/gtkglarea.c
gtk/gtkglarea.h
gtk/gtkgrid.c
gtk/gtkgrid.h
gtk/gtkgridlayout.c
gtk/gtkiconcache.c
gtk/gtkiconcachevalidatorprivate.h
gtk/gtkiconhelper.c
gtk/gtkiconhelperprivate.h
gtk/gtkicontheme.c
gtk/gtkicontheme.h
gtk/gtkiconview.c
gtk/gtkiconview.h
gtk/gtkiconviewprivate.h
gtk/gtkimage.c
gtk/gtkimage.h
gtk/gtkimagedefinition.c
gtk/gtkimagedefinitionprivate.h
gtk/gtkimcontext.c
gtk/gtkimcontext.h
gtk/gtkimcontextime.c
gtk/gtkimcontextquartz.c
gtk/gtkimcontextsimple.c
gtk/gtkimcontextsimple.h
gtk/gtkimcontextsimpleprivate.h
gtk/gtkimcontextwayland.c
gtk/gtkimmulticontext.c
gtk/gtkinfobar.c
gtk/gtkinfobar.h
gtk/gtklabel.c
gtk/gtklabel.h
gtk/gtklabelprivate.h
gtk/gtklevelbar.c
gtk/gtklinkbutton.c
gtk/gtklistbox.c
gtk/gtklistbox.h
gtk/gtkliststore.c
gtk/gtkliststore.h
gtk/gtkmagnifier.c
gtk/gtkmain.c
gtk/gtkmarshalers.list
gtk/gtkmediastream.c
gtk/gtkmediastream.h
gtk/gtkmenusectionbox.c
gtk/gtkmenutracker.c
gtk/gtkmenutrackeritem.c
gtk/gtkmenutrackeritemprivate.h
gtk/gtkmenutrackerprivate.h
gtk/gtkmodules.c
gtk/gtkmountoperation-stub.c
gtk/gtkmountoperation-x11.c
gtk/gtkmountoperation.c
gtk/gtkmountoperationprivate.h
gtk/gtknativedialog.c
gtk/gtknativedialog.h
gtk/gtknotebook.c
gtk/gtknotebook.h
gtk/gtkpadcontroller.c
gtk/gtkpadcontroller.h
gtk/gtkpagesetupunixdialog.c
gtk/gtkpaned.c
gtk/gtkpaned.h
gtk/gtkpango.c
gtk/gtkpango.h
gtk/gtkpapersize.c
gtk/gtkpathbar.c
gtk/gtkpicture.c
gtk/gtkplacessidebar.c
gtk/gtkplacessidebarprivate.h
gtk/gtkplacesview.c
gtk/gtkplacesviewrow.c
gtk/gtkpointerfocusprivate.h
gtk/gtkpopover.c
gtk/gtkpopovermenubar.c
gtk/gtkprintbackend.c
gtk/gtkprintbackendprivate.h
gtk/gtkprinter.c
gtk/gtkprinter.h
gtk/gtkprinteroptionwidget.c
gtk/gtkprintjob.c
gtk/gtkprintjob.h
gtk/gtkprintoperation-private.h
gtk/gtkprintoperation-unix.c
gtk/gtkprintoperation.c
gtk/gtkprintoperation.h
gtk/gtkprintoperationpreview.c
gtk/gtkprintoperationpreview.h
gtk/gtkprintsettings.c
gtk/gtkprintsettings.h
gtk/gtkprintunixdialog.c
gtk/gtkprintunixdialog.h
gtk/gtkquartz.c
gtk/gtkquery.c
gtk/gtkrange.c
gtk/gtkrange.h
gtk/gtkrangeprivate.h
gtk/gtkrecentmanager.c
gtk/gtkrecentmanager.h
gtk/gtkrendericonprivate.h
gtk/gtkroundedbox.c
gtk/gtkscale.c
gtk/gtkscale.h
gtk/gtkscrolledwindow.c
gtk/gtkscrolledwindow.h
gtk/gtksettings.c
gtk/gtksettingsprivate.h
gtk/gtkshortcutlabel.c
gtk/gtkshortcutssection.c
gtk/gtkshortcuttrigger.c
gtk/gtkshortcuttrigger.h
gtk/gtksidebarrow.c
gtk/gtksizegroup.c
gtk/gtksizerequest.c
gtk/gtksizerequest.h
gtk/gtksizerequestcache.c
gtk/gtksizerequestcacheprivate.h
gtk/gtksortkeysprivate.h
gtk/gtkspinbutton.c
gtk/gtkspinbutton.h
gtk/gtkstack.c
gtk/gtkstylecontext.c
gtk/gtkstylecontext.h
gtk/gtkswitch.c
gtk/gtktext.h
gtk/gtktextattributes.h
gtk/gtktextbtree.c
gtk/gtktextbtree.h
gtk/gtktextbuffer.c
gtk/gtktextbuffer.h
gtk/gtktextbufferprivate.h
gtk/gtktexthandle.c
gtk/gtktextiter.c
gtk/gtktextiter.h
gtk/gtktextiterprivate.h
gtk/gtktextlayout.c
gtk/gtktextlayoutprivate.h
gtk/gtktextlinedisplaycache.c
gtk/gtktextlinedisplaycacheprivate.h
gtk/gtktextprivate.h
gtk/gtktextsegment.h
gtk/gtktexttag.c
gtk/gtktexttag.h
gtk/gtktexttagtable.c
gtk/gtktexttagtable.h
gtk/gtktextutil.c
gtk/gtktextutil.h
gtk/gtktextview.c
gtk/gtktextview.h
gtk/gtktooltip.c
gtk/gtktooltipprivate.h
gtk/gtktrashmonitor.c
gtk/gtktreedatalist.c
gtk/gtktreedatalist.h
gtk/gtktreednd.c
gtk/gtktreemodel.c
gtk/gtktreemodel.h
gtk/gtktreemodelfilter.c
gtk/gtktreemodelfilter.h
gtk/gtktreemodelsort.c
gtk/gtktreepopover.c
gtk/gtktreeprivate.h
gtk/gtktreerbtree.c
gtk/gtktreerbtreeprivate.h
gtk/gtktreeselection.c
gtk/gtktreeselection.h
gtk/gtktreesortable.c
gtk/gtktreesortable.h
gtk/gtktreestore.c
gtk/gtktreestore.h
gtk/gtktreeview.c
gtk/gtktreeview.h
gtk/gtktreeviewcolumn.c
gtk/gtktreeviewcolumn.h
gtk/gtkvolumebutton.c
gtk/gtkwidget.c
gtk/gtkwidget.h
gtk/gtkwidgetprivate.h
gtk/gtkwindow.c
gtk/gtkwindow.h
gtk/gtkwindowhandle.c
gtk/inspector/actions.c
gtk/inspector/cellrenderergraph.c
gtk/inspector/css-editor.c
gtk/inspector/css-node-tree.c
gtk/inspector/general.c
gtk/inspector/gtktreemodelcssnode.c
gtk/inspector/gtktreemodelcssnode.h
gtk/inspector/layoutoverlay.c
gtk/inspector/menu.c
gtk/inspector/misc-info.c
gtk/inspector/prop-editor.c
gtk/inspector/resource-list.c
gtk/inspector/statistics.c
gtk/inspector/strv-editor.c
gtk/inspector/tree-data.c
gtk/inspector/type-info.c
gtk/inspector/visual.c
gtk/inspector/window.h
gtk/tools/gdkpixbufutils.c
gtk/tools/gtk-builder-tool-enumerate.c
gtk/tools/gtk-builder-tool-simplify.c
gtk/tools/gtk-builder-tool-validate.c
gtk/tools/gtkiconcachevalidator.c
gtk/tools/updateiconcache.c
modules/printbackends/gtkcloudprintaccount.c
modules/printbackends/gtkcupssecretsutils.c
modules/printbackends/gtkcupsutils.c
modules/printbackends/gtkcupsutils.h
modules/printbackends/gtkprintbackendcloudprint.c
modules/printbackends/gtkprintbackendcups.c
modules/printbackends/gtkprintbackendfile.c
modules/printbackends/gtkprintbackendlpr.c
modules/printbackends/gtkprintercups.h
tests/listmodel.c
tests/overlayscroll.c
tests/syncscroll.c
tests/testaccel.c
tests/testappchooser.c
tests/testassistant.c
tests/testbaseline.c
tests/testcalendar.c
tests/testcellarea.c
tests/testcombo.c
tests/testcombochange.c
tests/testellipsise.c
tests/testentrycompletion.c
tests/testentryicons.c
tests/testerrors.c
tests/testfilechooser.c
tests/testflowbox.c
tests/testfontchooserdialog.c
tests/testgmenu.c
tests/testgrid.c
tests/testgtk.c
tests/testheightforwidth.c
tests/testiconview-keynav.c
tests/testiconview.c
tests/testkineticscrolling.c
tests/testlist.c
tests/testlist2.c
tests/testlist3.c
tests/testlist4.c
tests/testmountoperation.c
tests/testnotebookdnd.c
tests/testrc.c
tests/testrevealer.c
tests/testscrolledge.c
tests/testscrolledwindow.c
tests/testselectionmode.c
tests/testspinbutton.c
tests/teststack.c
tests/testtexthistory.c
tests/testtooltips.c
tests/testtreecolumns.c
tests/testtreeedit.c
tests/testtreeflow.c
tests/testtreefocus.c
tests/testtreemodel.c
tests/testtreepos.c
tests/testtreesort.c
tests/testtreeview.c
tests/testverticalcells.c
tests/testvolumebutton.c
tests/testwindowsize.c
tests/treestoretest.c
tests/video-timer.c
testsuite/a11y/accessibility-dump.c
testsuite/a11y/children.c
testsuite/a11y/state/state-record.c
testsuite/a11y/text.c
testsuite/a11y/tree-performance.c
testsuite/a11y/tree-relationships.c
testsuite/a11y/value.c
testsuite/gdk/encoding.c
testsuite/gdk/keysyms.c
testsuite/gdk/memorytexture.c
testsuite/gtk/adjustment.c
testsuite/gtk/builder.c
testsuite/gtk/entry.c
testsuite/gtk/filtermodel.c
testsuite/gtk/gestures.c
testsuite/gtk/grid.c
testsuite/gtk/gtktreemodelrefcount.c
testsuite/gtk/gtktreemodelrefcount.h
testsuite/gtk/icontheme.c
testsuite/gtk/listbox.c
testsuite/gtk/liststore.c
testsuite/gtk/notify.c
testsuite/gtk/objects-finalize.c
testsuite/gtk/rbtree.c
testsuite/gtk/recentmanager.c
testsuite/gtk/spinbutton.c
testsuite/gtk/textbuffer.c
testsuite/gtk/textiter.c
testsuite/gtk/treemodel.c
testsuite/gtk/treepath.c
testsuite/gtk/treestore.c
testsuite/gtk/typename.c
testsuite/gtk/window.c
testsuite/reftests/reftest-snapshot.c
testsuite/reftests/textview-border-windows.c

index aa130d9c13fe27d54d9b8b25b28945ca2a4ec32b..ca65cb695d63d10028e8096bc736ee8782ddb95e 100644 (file)
@@ -81,11 +81,11 @@ constraint_editor_application_activate (GApplication *app)
 static void
 constraint_editor_application_open (GApplication  *app,
                                     GFile        **files,
-                                    gint           n_files,
+                                    int            n_files,
                                     const gchar   *hint)
 {
   ConstraintEditorWindow *win;
-  gint i;
+  int i;
 
   for (i = 0; i < n_files; i++)
     {
index ac724993e49d48a2c82de787cc3e2ccb4a05be96..ba25a806ec29e90fe9a21734295e8224141b860f 100644 (file)
@@ -193,7 +193,7 @@ constraint_editor_window_load (ConstraintEditorWindow *self,
 
 static void
 open_response_cb (GtkNativeDialog        *dialog,
-                  gint                    response,
+                  int                     response,
                   ConstraintEditorWindow *self)
 {
   gtk_native_dialog_hide (dialog);
@@ -285,7 +285,7 @@ serialize_model (GListModel *list)
 
 static void
 save_response_cb (GtkNativeDialog        *dialog,
-                  gint                    response,
+                  int                     response,
                   ConstraintEditorWindow *self)
 {
   gtk_native_dialog_hide (dialog);
index cef94fca2856e43ae943ca31687d84acdd30a021..2b5e8e094a29005c94c5a89c69a36b01469500e5 100644 (file)
@@ -92,7 +92,7 @@ activate_new (GSimpleAction *action,
 
 static void
 open_response_cb (GtkNativeDialog *dialog,
-                  gint             response_id,
+                  int              response_id,
                   gpointer         user_data)
 {
   GtkFileChooserNative *native = user_data;
@@ -245,8 +245,8 @@ update_statusbar (GtkTextBuffer         *buffer,
                   DemoApplicationWindow *window)
 {
   gchar *msg;
-  gint row, col;
-  gint count;
+  int row, col;
+  int count;
   GtkTextIter iter;
 
   /* clear any previous message, underflow is allowed */
index 53bc8db5a4c3309b25f5e04e52ee47f757bbb0ee..b90e42ab55729acbfbcffcff42889726bd0191bd 100644 (file)
@@ -47,7 +47,7 @@ on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 static void
 on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
 {
-  gint current_page, n_pages;
+  int current_page, n_pages;
   gchar *title;
 
   current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
@@ -70,7 +70,7 @@ on_entry_changed (GtkWidget *widget, gpointer data)
 {
   GtkAssistant *assistant = GTK_ASSISTANT (data);
   GtkWidget *current_page;
-  gint page_number;
+  int page_number;
   const gchar *text;
 
   page_number = gtk_assistant_get_current_page (assistant);
index 3ed180a9b50da974185eeacbc9125d547780999b..0686eaf59bc9775ea23e698e67e17034d945d621 100644 (file)
@@ -38,7 +38,7 @@ create_icon_store (void)
 
   GtkTreeIter iter;
   GtkListStore *store;
-  gint i;
+  int i;
 
   store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -77,7 +77,7 @@ set_sensitive (GtkCellLayout   *cell_layout,
                gpointer         data)
 {
   GtkTreePath *path;
-  gint *indices;
+  int *indices;
   gboolean sensitive;
 
   path = gtk_tree_model_get_path (tree_model, iter);
@@ -175,7 +175,7 @@ create_capital_store (void)
 
   GtkTreeIter iter, iter2;
   GtkTreeStore *store;
-  gint i;
+  int i;
 
   store = gtk_tree_store_new (1, G_TYPE_STRING);
 
index df791aad3102c82a5edef388c8ba3eb0f80a0d25..5efd3cf32b37fbe8c3bf7e233352732586aeb7c4 100644 (file)
@@ -75,7 +75,7 @@ setup_listbox (GtkBuilder       *builder,
 {
   GtkWidget *normal_row;
   GtkWidget *listbox;
-  gint i;
+  int i;
 
   normal_row = NULL;
   listbox = gtk_list_box_new ();
index ed5e6b072e39f2ecb431126f9c206ddfabf8bbd5..91b1bfa8bb5db233c3801b79a10c6c5fa1823bbb 100644 (file)
@@ -16,7 +16,7 @@ message_dialog_clicked (GtkButton *button,
                         gpointer   user_data)
 {
   GtkWidget *dialog;
-  static gint i = 1;
+  static int i = 1;
 
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
index 993daff49160cbba4b7965fdb9cb63b90b4dea00..0cc307b160109acfe1945ed0964bf7ff535d94a5 100644 (file)
@@ -16,9 +16,9 @@
 
 typedef struct
 {
-  gint   number;
+  int    number;
   gchar *product;
-  gint   yummy;
+  int    yummy;
 }
 Item;
 
@@ -74,7 +74,7 @@ add_items (void)
 static GtkTreeModel *
 create_items_model (void)
 {
-  gint i = 0;
+  int i = 0;
   GtkListStore *model;
   GtkTreeIter iter;
 
@@ -109,7 +109,7 @@ static GtkTreeModel *
 create_numbers_model (void)
 {
 #define N_NUMBERS 10
-  gint i = 0;
+  int i = 0;
   GtkListStore *model;
   GtkTreeIter iter;
 
@@ -192,7 +192,7 @@ remove_item (GtkWidget *widget, gpointer data)
 
   if (gtk_tree_selection_get_selected (selection, NULL, &iter))
     {
-      gint i;
+      int i;
       GtkTreePath *path;
 
       path = gtk_tree_model_get_path (model, &iter);
@@ -211,7 +211,7 @@ separator_row (GtkTreeModel *model,
                gpointer      data)
 {
   GtkTreePath *path;
-  gint idx;
+  int idx;
 
   path = gtk_tree_model_get_path (model, iter);
   idx = gtk_tree_path_get_indices (path)[0];
@@ -241,7 +241,7 @@ cell_edited (GtkCellRendererText *cell,
   GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
   GtkTreeIter iter;
 
-  gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
+  int column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
 
   gtk_tree_model_get_iter (model, &iter, path);
 
@@ -249,7 +249,7 @@ cell_edited (GtkCellRendererText *cell,
     {
     case COLUMN_ITEM_NUMBER:
       {
-        gint i;
+        int i;
 
         i = gtk_tree_path_get_indices (path)[0];
         g_array_index (articles, Item, i).number = atoi (new_text);
@@ -261,7 +261,7 @@ cell_edited (GtkCellRendererText *cell,
 
     case COLUMN_ITEM_PRODUCT:
       {
-        gint i;
+        int i;
         gchar *old_text;
 
         gtk_tree_model_get (model, &iter, column, &old_text, -1);
index 51142b1b4d6326cc03cd76797698b03c6fc315d2..d5dcd12cc6cd69fcb4d61036ed0c5f003ea4e18d 100644 (file)
@@ -13,7 +13,7 @@
 static GtkWidget *window = NULL;
 
 static void
-response_cb (GtkDialog *dialog, gint response_id)
+response_cb (GtkDialog *dialog, int response_id)
 {
   gtk_window_destroy (GTK_WINDOW (window));
   window = NULL;
index e3a55c4f9911a8d6655f71bc875a9fc016e66206..b1492c71ca6918446bcc64cadf850bd9b8dd7fb1 100644 (file)
@@ -22,7 +22,7 @@ format_number (GtkTreeViewColumn *col,
                GtkTreeIter       *iter,
                gpointer           data)
 {
-  gint num;
+  int num;
   gchar *text;
 
   gtk_tree_model_get (model, iter, GPOINTER_TO_INT (data), &num, -1);
@@ -35,11 +35,11 @@ static void
 filter_modify_func (GtkTreeModel *model,
                     GtkTreeIter  *iter,
                     GValue       *value,
-                    gint          column,
+                    int           column,
                     gpointer      data)
 {
   GtkTreeModelFilter *filter_model = GTK_TREE_MODEL_FILTER (model);
-  gint width, height;
+  int width, height;
   GtkTreeModel *child_model;
   GtkTreeIter child_iter;
 
@@ -75,7 +75,7 @@ visible_func (GtkTreeModel *model,
               GtkTreeIter  *iter,
               gpointer      data)
 {
-  gint width;
+  int width;
 
   gtk_tree_model_get (model, iter,
                       WIDTH_COLUMN, &width,
index 99f9db51752dad1fbfe9a7d3c037a34c27931cd8..2673e35d081ac0090b5820816fa4e4e52a79dcfa 100644 (file)
@@ -716,7 +716,7 @@ do_flowbox (GtkWidget *do_widget)
     "YellowGreen",
     NULL
   };
-  gint i;
+  int i;
 
   if (!window)
     {
index 98370776ea5fc5cabff08d7bc37fa0a288cc2511..09ca98676482e68b6681ae720cc053898a1d0655 100644 (file)
@@ -295,7 +295,7 @@ update_display (void)
   GList *l;
   PangoAttrList *attrs;
   PangoAttribute *attr;
-  gint ins, bound;
+  int ins, bound;
   guint start, end;
   PangoLanguage *lang;
   char *font_desc;
@@ -479,7 +479,7 @@ update_script_combo (void)
 {
   GtkListStore *store;
   hb_font_t *hb_font;
-  gint i, j, k;
+  int i, j, k;
   PangoFont *pango_font;
   GHashTable *tags;
   GHashTableIter iter;
@@ -593,7 +593,7 @@ update_script_combo (void)
 static void
 update_features (void)
 {
-  gint i, j;
+  int i, j;
   GtkTreeModel *model;
   GtkTreeIter iter;
   guint script_index, lang_index;
index 0a7aae63396ae5b77a9a0176a9216d981c493762..38367992938cd42244aaab5aa34d17e73062b7af 100644 (file)
@@ -36,11 +36,11 @@ adjustment_get_normalized_value (GtkAdjustment *adj)
 
 static void
 val_to_xy (GtkFontPlane *plane,
-           gint          *x,
-           gint          *y)
+           int           *x,
+           int           *y)
 {
   gdouble u, v;
-  gint width, height;
+  int width, height;
 
   width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
   height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
@@ -57,8 +57,8 @@ plane_snapshot (GtkWidget   *widget,
                 GtkSnapshot *snapshot)
 {
   GtkFontPlane *plane = GTK_FONT_PLANE (widget);
-  gint x, y;
-  gint width, height;
+  int x, y;
+  int width, height;
   cairo_t *cr;
 
   val_to_xy (plane, &x, &y);
@@ -125,8 +125,8 @@ adjustment_set_normalized_value (GtkAdjustment *adj,
 
 static void
 update_value (GtkFontPlane *plane,
-              gint           x,
-              gint           y)
+              int            x,
+              int            y)
 {
   GtkWidget *widget = GTK_WIDGET (plane);
   gdouble u, v;
index ff30f1d87392ec66e5ff4fd545f36e80a4272fc4..dd33486e150c265f66bf8e83c45f9dd09e302405 100644 (file)
@@ -98,7 +98,7 @@ gtk_fishbowl_measure (GtkWidget      *widget,
   GHashTableIter iter;
   gpointer key, value;
   GtkFishbowlChild *child;
-  gint child_min, child_nat;
+  int child_min, child_nat;
 
   *minimum = 0;
   *natural = 0;
index 7aea95592076626cf32f41f76a40e5f3ea0eedb5..ad753c175604c7c862179138de802ca6c75131d0 100644 (file)
@@ -18,7 +18,7 @@ static void
 insert_link (GtkTextBuffer *buffer,
              GtkTextIter   *iter,
              const char    *text,
-             gint           page)
+             int            page)
 {
   GtkTextTag *tag;
 
@@ -35,7 +35,7 @@ insert_link (GtkTextBuffer *buffer,
  */
 static void
 show_page (GtkTextBuffer *buffer,
-           gint           page)
+           int            page)
 {
   GtkTextIter iter;
 
@@ -91,7 +91,7 @@ follow_if_link (GtkWidget   *text_view,
   for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
     {
       GtkTextTag *tag = tagp->data;
-      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+      int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
 
       if (page != 0)
         {
@@ -134,8 +134,8 @@ key_pressed (GtkEventController *controller,
 }
 
 static void set_cursor_if_appropriate (GtkTextView *text_view,
-                                       gint         x,
-                                       gint         y);
+                                       int          x,
+                                       int          y);
 
 static void
 released_cb (GtkGestureClick *gesture,
@@ -183,8 +183,8 @@ static gboolean hovering_over_link = FALSE;
  */
 static void
 set_cursor_if_appropriate (GtkTextView    *text_view,
-                           gint            x,
-                           gint            y)
+                           int             x,
+                           int             y)
 {
   GSList *tags = NULL, *tagp = NULL;
   GtkTextIter iter;
@@ -196,7 +196,7 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
       for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
         {
           GtkTextTag *tag = tagp->data;
-          gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+          int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
 
           if (page != 0)
             {
index e13ee749f6f86e034ba3e483a562f161778d307d..cd462de8443e87409b1d4bfcf7903c76d1c3c13a 100644 (file)
@@ -90,7 +90,7 @@ fill_store (GtkListStore *store)
   g_dir_close (dir);
 }
 
-static gint
+static int
 sort_func (GtkTreeModel *model,
            GtkTreeIter  *a,
            GtkTreeIter  *b,
index f04a6361e8793b9f526af4c76fcb7666ca94e668..6225230a648a7b79886cd58e0c7aeb2527ee4c47 100644 (file)
@@ -20,7 +20,7 @@ fill_store (GtkListStore *store)
 {
   GtkTreeIter iter;
   const gchar *text[] = { "Red", "Green", "Blue", "Yellow" };
-  gint i;
+  int i;
 
   /* First clear the store */
   gtk_list_store_clear (store);
@@ -60,10 +60,10 @@ set_cell_color (GtkCellLayout   *cell_layout,
 
   if (gdk_rgba_parse (&color, text))
     pixel =
-      ((gint)(color.red * 255)) << 24 |
-      ((gint)(color.green * 255)) << 16 |
-      ((gint)(color.blue  * 255)) << 8 |
-      ((gint)(color.alpha * 255));
+      ((int)(color.red * 255)) << 24 |
+      ((int)(color.green * 255)) << 16 |
+      ((int)(color.blue  * 255)) << 8 |
+      ((int)(color.alpha * 255));
 
   g_free (text);
 
index 90684bc0ed01c27016ccc3f28a7a77c7aeb14578..c034c349208147b96527a2ca2d33d50c8ffedad8 100644 (file)
@@ -43,10 +43,10 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
 
 static void
 progressive_updated_callback (GdkPixbufLoader *loader,
-                              gint                 x,
-                              gint                 y,
-                              gint                 width,
-                              gint                 height,
+                              int                  x,
+                              int                  y,
+                              int                  width,
+                              int                  height,
                               gpointer     data)
 {
   GtkWidget *picture;
@@ -58,7 +58,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
   gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }
 
-static gint
+static int
 progressive_timeout (gpointer data)
 {
   GtkWidget *picture;
index 3d12b2614159c4d97e5d978c2d1d0b99c8154227..32f88c8eb8b1ab8fe2a1591c8fe0338605347d25 100644 (file)
@@ -8,7 +8,7 @@
 
 static void
 on_bar_response (GtkInfoBar *info_bar,
-                 gint        response_id,
+                 int         response_id,
                  gpointer    user_data)
 {
   GtkWidget *dialog;
index 72cab2c22e8a73a03df19167eba48902d8e50135..b8afd5663838e9518ed490db9ffee003ca11f657 100644 (file)
@@ -9,7 +9,7 @@
 
 static void
 response_cb (GtkWidget *dialog,
-             gint       response_id,
+             int        response_id,
              gpointer   data)
 {
   gtk_window_destroy (GTK_WINDOW (dialog));
index fb31fc54578f3458005ac2d251a9d357f65ee9c7..42f88bd9e89f52212436786acd5afef87d0e9d4e 100644 (file)
@@ -81,7 +81,7 @@ spinner_timeout (gpointer data)
 static GtkTreeModel *
 create_model (void)
 {
-  gint i = 0;
+  int i = 0;
   GtkListStore *store;
   GtkTreeIter iter;
 
index 0e3283aaa85b723f239472e11ba1d8a147769e3a..aea46e21ea6b7f15f489fd9d9e27aec26015b327 100644 (file)
@@ -252,7 +252,6 @@ static const char *types[] =
   "static",
   "const ",
   "void",
-  "gint",
   " int ",
   " char ",
   "gchar ",
@@ -387,11 +386,11 @@ static const char *control[] =
 void
 parse_chars (gchar       *text,
              gchar      **end_ptr,
-             gint        *state,
+             int         *state,
              const char **tag,
              gboolean     start)
 {
-  gint i;
+  int i;
   gchar *next_token;
 
   /* Handle comments first */
@@ -462,7 +461,7 @@ parse_chars (gchar       *text,
   /* check for string */
   if (text[0] == '"')
     {
-      gint maybe_escape = FALSE;
+      int maybe_escape = FALSE;
 
       *end_ptr = text + 1;
       *tag = "string";
@@ -525,7 +524,7 @@ void
 fontify (GtkTextBuffer *source_buffer)
 {
   GtkTextIter start_iter, next_iter, tmp_iter;
-  gint state;
+  int state;
   gchar *text;
   gchar *start_ptr, *end_ptr;
   const char *tag;
@@ -742,7 +741,7 @@ add_data_tab (const gchar *demoname)
 static void
 remove_data_tabs (void)
 {
-  gint i;
+  int i;
 
   for (i = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) - 1; i > 1; i--)
     gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), i);
@@ -760,7 +759,7 @@ load_file (const gchar *demoname,
   gboolean in_para = 0;
   gchar **lines;
   GBytes *bytes;
-  gint i;
+  int i;
 
   if (!g_strcmp0 (current_file, filename))
     return;
@@ -1190,7 +1189,7 @@ list_demos (void)
     }
 }
 
-static gint
+static int
 command_line (GApplication            *app,
               GApplicationCommandLine *cmdline)
 {
index 9eec7beebff054270b35a018c6f3aed8efb4cb31..10b4476fb28c457feddad8e35428c222e4863880 100644 (file)
@@ -12,9 +12,9 @@ static void
 margin_changed (GtkAdjustment *adjustment,
                 GtkTextView   *text)
 {
-  gint value;
+  int value;
 
-  value = (gint)gtk_adjustment_get_value (adjustment);
+  value = (int)gtk_adjustment_get_value (adjustment);
   gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text), value);
   g_object_set (tag, "pixels-above-lines", value, NULL);
 }
index 45f6982f6a50be7a036707073faa77383afcf882..09150a9eb71b601786b328b6bd0bf81f56ad13f4 100644 (file)
@@ -9,7 +9,7 @@
 #include <gtk/gtkunixprint.h>
 
 static void
-done_cb (GtkDialog *dialog, gint response, gpointer data)
+done_cb (GtkDialog *dialog, int response, gpointer data)
 {
   gtk_window_destroy (GTK_WINDOW (dialog));
 }
index f3ba91d244f216cd583e49838ca5500b76305c2d..871733027623f7365be35eb6cce970bd780fb3f5 100644 (file)
@@ -55,8 +55,8 @@ static void drawing_area_set_color (DrawingArea *area,
 
 static void
 drawing_area_ensure_surface (DrawingArea *area,
-                             gint         width,
-                             gint         height)
+                             int          width,
+                             int          height)
 {
   if (!area->surface ||
       cairo_image_surface_get_width (area->surface) != width ||
@@ -195,7 +195,7 @@ drawing_area_root (GtkWidget *widget)
   GSimpleActionGroup *action_group;
   GSimpleAction *action;
   GtkWidget *toplevel;
-  gint i;
+  int i;
 
   GTK_WIDGET_CLASS (drawing_area_parent_class)->root (widget);
 
index 1c67404e0d5aceef80ca7a2098ec77507bf3f587..c2de1bb343002b4f5ce2d88c363a759d14c0dc34 100644 (file)
@@ -39,7 +39,7 @@ static GdkPixbuf *frame;
 
 /* Background image */
 static GdkPixbuf *background;
-static gint back_width, back_height;
+static int back_width, back_height;
 
 /* Images */
 static GdkPixbuf *images[N_IMAGES];
@@ -51,7 +51,7 @@ static GtkWidget *da;
 static gboolean
 load_pixbufs (GError **error)
 {
-  gint i;
+  int i;
 
   if (background)
     return TRUE; /* already loaded earlier */
index bca12a05721c2e78b4740958806b8b5f44022fb0..96232db40faa871b7890414973dd386283f287f0 100644 (file)
@@ -17,10 +17,10 @@ typedef struct
   gchar *resourcename;
   gdouble font_size;
 
-  gint lines_per_page;
+  int lines_per_page;
   gchar **lines;
-  gint num_lines;
-  gint num_pages;
+  int num_lines;
+  int num_pages;
 } PrintData;
 
 static void
@@ -55,15 +55,15 @@ begin_print (GtkPrintOperation *operation,
 static void
 draw_page (GtkPrintOperation *operation,
            GtkPrintContext   *context,
-           gint               page_nr,
+           int                page_nr,
            gpointer           user_data)
 {
   PrintData *data = (PrintData *)user_data;
   cairo_t *cr;
   PangoLayout *layout;
-  gint text_width, text_height;
+  int text_width, text_height;
   gdouble width;
-  gint line, i;
+  int line, i;
   PangoFontDescription *desc;
   gchar *page_str;
 
index 0f7d0979528f83de533219d2bb18aaeca7c6148d..c3ed6b4cdda7d11b751326d4cbd2f7080bcf047a 100644 (file)
@@ -6,7 +6,7 @@
 
 #include <gtk/gtk.h>
 
-static gint count = 0;
+static int count = 0;
 static guint timeout = 0;
 
 static void
index aa3872b8583c13a83dd1f0b1f1189522829aa021..8905e4359b2fd764d4eb2f812709e84c5f33d3c5 100644 (file)
@@ -123,7 +123,7 @@ set_search_by (GSimpleAction *action,
 
 static void
 icon_press_cb (GtkEntry       *entry,
-               gint            position,
+               int             position,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
index 307bb52dc1f5a3598f3c8d27d90330b676a5c60e..e00dfb87de5496f5758479c82c729269954d2312 100644 (file)
@@ -11,7 +11,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-gint
+int
 spinbutton_hex_spin_input (GtkSpinButton *spin_button,
                            gdouble       *new_val)
 {
@@ -28,7 +28,7 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
     return TRUE;
 }
 
-gint
+int
 spinbutton_hex_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
@@ -40,7 +40,7 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
   if (fabs (val) < 1e-5)
     buf = g_strdup ("0x00");
   else
-    buf = g_strdup_printf ("0x%.2X", (gint) val);
+    buf = g_strdup_printf ("0x%.2X", (int) val);
   if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button))))
     gtk_editable_set_text (GTK_EDITABLE (spin_button), buf);
   g_free (buf);
@@ -48,15 +48,15 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-gint
+int
 spinbutton_time_spin_input (GtkSpinButton *spin_button,
                             gdouble       *new_val)
 {
   const gchar *text;
   gchar **str;
   gboolean found = FALSE;
-  gint hours;
-  gint minutes;
+  int hours;
+  int minutes;
   gchar *endh;
   gchar *endm;
 
@@ -87,7 +87,7 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
+int
 spinbutton_time_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
@@ -121,11 +121,11 @@ static const char *month[12] = {
   "December"
 };
 
-gint
+int
 spinbutton_month_spin_input (GtkSpinButton *spin_button,
                              gdouble       *new_val)
 {
-  gint i;
+  int i;
   gchar *tmp1, *tmp2;
   gboolean found = FALSE;
 
@@ -150,12 +150,12 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
+int
 spinbutton_month_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gdouble value;
-  gint i;
+  int i;
 
   adjustment = gtk_spin_button_get_adjustment (spin_button);
   value = gtk_adjustment_get_value (adjustment);
index 37fcc001afc7d65d5facf721ab0c101237742b64..a15dbab32ac67c78a26a05a329e57d546b6162b4 100644 (file)
@@ -230,7 +230,7 @@ item_toggled (GtkCellRendererToggle *cell,
   GtkTreeIter iter;
   gboolean toggle_item;
 
-  gint *column;
+  int *column;
 
   column = g_object_get_data (G_OBJECT (cell), "column");
 
@@ -252,7 +252,7 @@ item_toggled (GtkCellRendererToggle *cell,
 static void
 add_columns (GtkTreeView *treeview)
 {
-  gint col_offset;
+  int col_offset;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   GtkTreeModel *model = gtk_tree_view_get_model (treeview);
@@ -272,7 +272,7 @@ add_columns (GtkTreeView *treeview)
   /* alex column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)ALEX_COLUMN);
 
   g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
 
@@ -294,7 +294,7 @@ add_columns (GtkTreeView *treeview)
   /* havoc column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)HAVOC_COLUMN);
 
   g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
 
@@ -315,7 +315,7 @@ add_columns (GtkTreeView *treeview)
   /* tim column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)TIM_COLUMN);
 
   g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
 
@@ -337,7 +337,7 @@ add_columns (GtkTreeView *treeview)
   /* owen column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)OWEN_COLUMN);
 
   g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
 
@@ -358,7 +358,7 @@ add_columns (GtkTreeView *treeview)
   /* dave column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)DAVE_COLUMN);
 
   g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
 
index cfd91b2f0f263b363affde30f150ec8ddab1d537..b276fdd1422b2ba2cdcaf2f464072b6eeb581445 100644 (file)
@@ -161,7 +161,7 @@ copy_to_clipboard (GtkButton         *button,
 }
 
 static void
-set_image (GtkWidget *image, const gchar *name, gint size)
+set_image (GtkWidget *image, const gchar *name, int size)
 {
   gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
   gtk_image_set_pixel_size (GTK_IMAGE (image), size);
index abc8dea47b6f30c1fcfecf95a21ecd5dbdd39f98..6fefa60b7a5a882787efe40b33fa7bb68d43801d 100644 (file)
@@ -199,11 +199,11 @@ node_editor_application_activate (GApplication *app)
 static void
 node_editor_application_open (GApplication  *app,
                               GFile        **files,
-                              gint           n_files,
+                              int            n_files,
                               const gchar   *hint)
 {
   NodeEditorWindow *win;
-  gint i;
+  int i;
 
   for (i = 0; i < n_files; i++)
     {
index 293a55862268bee777418ae6a73ef4fc4284cc9e..7b20364496f9be3ff7b7a68c6b9b8b9936299584 100644 (file)
@@ -288,14 +288,14 @@ text_view_query_tooltip_cb (GtkWidget        *widget,
 
   if (keyboard_tip)
     {
-      gint offset;
+      int offset;
 
       g_object_get (self->text_buffer, "cursor-position", &offset, NULL);
       gtk_text_buffer_get_iter_at_offset (self->text_buffer, &iter, offset);
     }
   else
     {
-      gint bx, by, trailing;
+      int bx, by, trailing;
 
       gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (self->text_view), GTK_TEXT_WINDOW_TEXT,
                                              x, y, &bx, &by);
@@ -399,7 +399,7 @@ node_editor_window_load (NodeEditorWindow *self,
 
 static void
 open_response_cb (GtkWidget        *dialog,
-                  gint              response,
+                  int               response,
                   NodeEditorWindow *self)
 {
   gtk_widget_hide (dialog);
@@ -448,7 +448,7 @@ open_cb (GtkWidget        *button,
 
 static void
 save_response_cb (GtkWidget        *dialog,
-                  gint              response,
+                  int               response,
                   NodeEditorWindow *self)
 {
   gtk_widget_hide (dialog);
@@ -577,7 +577,7 @@ create_cairo_texture (NodeEditorWindow *self)
 
 static void
 export_image_response_cb (GtkWidget  *dialog,
-                          gint        response,
+                          int         response,
                           GdkTexture *texture)
 {
   gtk_widget_hide (dialog);
index eda61a061d91411a3d964a7926ec01ff3a9f8186..69a5819ae34a06f2d83928c5f2415a66f036c531 100644 (file)
@@ -34,7 +34,7 @@ static void
 update_statusbar (void)
 {
   gchar *msg;
-  gint row, col;
+  int row, col;
   GtkTextIter iter;
   const char *print_str;
 
index abc5fd12bae7534d7f8638e2ca4ba2d7853d18e2..f48a906e1b2f5a955925de64c0d6caaa74009887 100644 (file)
@@ -139,9 +139,9 @@ get_busy (GSimpleAction *action,
   gtk_widget_set_sensitive (window, FALSE);
 }
 
-static gint current_page = 0;
+static int current_page = 0;
 static gboolean
-on_page (gint i)
+on_page (int i)
 {
   return current_page == i;
 }
@@ -422,7 +422,7 @@ static void
 spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label)
 {
   GtkWidget *w;
-  gint v;
+  int v;
   gchar *text;
 
   v = (int)gtk_adjustment_get_value (adjustment);
@@ -454,8 +454,8 @@ spin_value_reset (GtkWidget *button, GtkAdjustment *adjustment)
   dismiss (button);
 }
 
-static gint pulse_time = 250;
-static gint pulse_entry_mode = 0;
+static int pulse_time = 250;
+static int pulse_entry_mode = 0;
 
 static void
 remove_pulse (gpointer pulse_id)
@@ -557,9 +557,9 @@ on_scale_button_value_changed (GtkScaleButton *button,
     }
   else
     {
-      gint percent;
+      int percent;
 
-      percent = (gint) (100. * val / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) + .5);
+      percent = (int) (100. * val / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) + .5);
 
       str = g_strdup_printf (C_("volume percentage", "%d %%"), percent);
     }
@@ -627,7 +627,7 @@ static void
 on_range_from_changed (GtkSpinButton *from)
 {
   GtkSpinButton *to;
-  gint v1, v2;
+  int v1, v2;
 
   to = GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (from), "range_to_spin"));
 
@@ -642,7 +642,7 @@ static void
 on_range_to_changed (GtkSpinButton *to)
 {
   GtkSpinButton *from;
-  gint v1, v2;
+  int v1, v2;
 
   from = GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (to), "range_from_spin"));
 
@@ -654,7 +654,7 @@ on_range_to_changed (GtkSpinButton *to)
 }
 
 static void
-info_bar_response (GtkWidget *infobar, gint response_id)
+info_bar_response (GtkWidget *infobar, int response_id)
 {
   if (response_id == GTK_RESPONSE_CLOSE)
     gtk_widget_hide (infobar);
@@ -1025,7 +1025,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
     { "7.5", "#C48299", NULL },
     { "10", "#C68292", NULL }
   };
-  gint i;
+  int i;
   GtkWidget *row, *box, *label, *swatch;
   GtkWidget *sw;
   GdkRGBA rgba;
@@ -1331,7 +1331,7 @@ my_text_view_set_adjustment (MyTextView *tv, GtkAdjustment *adjustment)
 }
 
 static void
-close_selection_dialog (GtkWidget *dialog, gint response, GtkWidget *tv)
+close_selection_dialog (GtkWidget *dialog, int response, GtkWidget *tv)
 {
   GtkWidget *box;
   GtkWidget *child;
@@ -1886,7 +1886,7 @@ activate (GApplication *app)
     { "app.paste", { "<Control>v", NULL } },
     { "win.delete", { "Delete", NULL } },
   };
-  gint i;
+  int i;
   GPermission *permission;
   GAction *action;
   GError *error = NULL;
@@ -2282,7 +2282,7 @@ main (int argc, char *argv[])
     { "check-off-disabled", NULL, NULL, "false", NULL },
     { "radio-x-disabled", NULL, "s", "'x'", NULL },
   };
-  gint status;
+  int status;
 
   app = gtk_application_new ("org.gtk.WidgetFactory4", G_APPLICATION_NON_UNIQUE);
 
index 1867bf3fc1bdf17f444a7e89367705d19e5625dc..3fc2e0c1012da620b952f70b07a61f95985e8130 100644 (file)
@@ -486,7 +486,7 @@ It is also possible to align the columns to the next tab:
   void          gtk_type_set_prop           (GtkType *type,
                                              gfloat   value);
   gfloat        gtk_type_get_prop           (GtkType *type);
-  gint          gtk_type_update_foobar      (GtkType *type);
+  int           gtk_type_update_foobar      (GtkType *type);
 ```
 
 Public headers should never be included directly:
index 42db8ce36e08ca5f3da9a18724fc69f5a1e880eb..6252defd1826300f9422cbfeee383a5de2b27903 100644 (file)
@@ -797,7 +797,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index ae2dc14f929035028aea7138300bf0faf582a184..09dea4a26b05c70327a15836e6040bcc3923a6f3 100644 (file)
@@ -141,8 +141,8 @@ take_window_shot (Window         child,
   XWindowAttributes attrs;
   Window xid;
   Display *dpy;
-  gint x = 0, y = 0;
-  gint width, height;
+  int x = 0, y = 0;
+  int width, height;
 
   GdkPixbuf *tmp, *tmp2;
   GdkPixbuf *retval = NULL;
index 565bc35c75cb23e8abf6fdcd8cacce70ea02fcf2..a730c1f555384d4f4f604fe4a4eb47ece8def15a 100644 (file)
@@ -27,7 +27,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 565bc35c75cb23e8abf6fdcd8cacce70ea02fcf2..a730c1f555384d4f4f604fe4a4eb47ece8def15a 100644 (file)
@@ -27,7 +27,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 565bc35c75cb23e8abf6fdcd8cacce70ea02fcf2..a730c1f555384d4f4f604fe4a4eb47ece8def15a 100644 (file)
@@ -27,7 +27,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 6ab68aebc3b8f34c0321b3b252fe4e8b0589a534..1376001f2ca2f4cd8cf567fea6eba0431df9c3bb 100644 (file)
@@ -63,7 +63,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 6ab68aebc3b8f34c0321b3b252fe4e8b0589a534..1376001f2ca2f4cd8cf567fea6eba0431df9c3bb 100644 (file)
@@ -63,7 +63,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 8ac0ebd529965617987db1b90abb94b94ea82853..89389fb52d5f1799a7443bb9afaad7dec4a4e1b5 100644 (file)
@@ -70,7 +70,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 8ac0ebd529965617987db1b90abb94b94ea82853..89389fb52d5f1799a7443bb9afaad7dec4a4e1b5 100644 (file)
@@ -70,7 +70,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 8ac0ebd529965617987db1b90abb94b94ea82853..89389fb52d5f1799a7443bb9afaad7dec4a4e1b5 100644 (file)
@@ -70,7 +70,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index 8ac0ebd529965617987db1b90abb94b94ea82853..89389fb52d5f1799a7443bb9afaad7dec4a4e1b5 100644 (file)
@@ -70,7 +70,7 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                   GFile        **files,
-                  gint           n_files,
+                  int            n_files,
                   const gchar   *hint)
 {
   GList *windows;
index ecaa9bc125d80f661150f2482c4bcbaff016c8ae..18fc9ae1efe60eb4c220ce96c55b867be02f62b1 100644 (file)
@@ -150,7 +150,7 @@ text_buffer_changed_cb (GtkTextBuffer *buffer,
 {
   GtkWindow *window = user_data;
   BloatPad *app;
-  gint old_n, n;
+  int old_n, n;
 
   app = (BloatPad *) gtk_window_get_application (window);
 
@@ -293,10 +293,10 @@ bloat_pad_activate (GApplication *application)
 static void
 bloat_pad_open (GApplication  *application,
                 GFile        **files,
-                gint           n_files,
+                int            n_files,
                 const gchar   *hint)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < n_files; i++)
     new_window (application, files[i]);
@@ -400,7 +400,7 @@ edit_accels (GSimpleAction *action,
   GtkWidget *entry;
   gchar **actions;
   GtkWidget *dialog;
-  gint i;
+  int i;
 
   dialog = gtk_dialog_new ();
   gtk_window_set_application (GTK_WINDOW (dialog), app);
@@ -482,7 +482,7 @@ static void
 dump_accels (GtkApplication *app)
 {
   gchar **actions;
-  gint i;
+  int i;
 
   actions = gtk_application_list_action_descriptions (app);
   for (i = 0; actions[i]; i++)
@@ -512,7 +512,7 @@ bloat_pad_startup (GApplication *application)
   GIcon *icon2;
   GEmblem *emblem;
   GFile *file;
-  gint i;
+  int i;
   struct {
     const gchar *action_and_target;
     const gchar *accelerators[2];
index fa7359ab26d7a3a48071f8c139394092072914db..d6add253f7da25ba5e37ec0ceebfb98bd152304e 100644 (file)
@@ -124,10 +124,10 @@ plug_man_activate (GApplication *application)
 static void
 plug_man_open (GApplication  *application,
                 GFile        **files,
-                gint           n_files,
+                int            n_files,
                 const gchar   *hint)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < n_files; i++)
     new_window (application, files[i]);
@@ -281,7 +281,7 @@ disable_plugin (const gchar *name)
   plugin_menu = find_plugin_menu ();
   if (plugin_menu)
     {
-      gint i;
+      int i;
 
       for (i = 0; i < g_menu_model_get_n_items (plugin_menu); i++)
         {
index 57908529579ca0e0e476b01a67c291121f7e8cf3..d5545294136f3c6ca2e2a8da835feb45d9627e78 100644 (file)
@@ -32,8 +32,8 @@ activate_cb (GtkApplication *app,
   gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (search_bar), window);
 }
 
-gint
-main (gint argc,
+int
+main (int argc,
     gchar *argv[])
 {
   GtkApplication *app;
index 2a22757e89d752ca2fcfb4cd68120706c04ede49..9cfd8bcbc06310fe2058ec22e8cd1e6ea96fd94b 100644 (file)
@@ -55,10 +55,10 @@ activate (GApplication *application)
 static void
 open (GApplication  *application,
       GFile        **files,
-      gint           n_files,
+      int            n_files,
       const gchar   *hint)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < n_files; i++)
     new_window (application, files[i]);
index 15d76cda750eb82426ffa5208da2917115de9b0b..896b25f5902d0d0bece8474c0d7e734733274bbe 100644 (file)
@@ -310,7 +310,7 @@ broadway_output_set_transient_for (BroadwayOutput *output,
   append_uint16 (output, parent_id);
 }
 
-static gint append_node_depth = -1;
+static int append_node_depth = -1;
 
 static void
 append_type (BroadwayOutput *output, guint32 type, BroadwayNode *node)
index c444e4f14ecbc75a1d9500970c0ca4e0c0f02c59..df6d25c066750fb0771b00411d16af06e6608052 100644 (file)
@@ -63,7 +63,7 @@ struct _BroadwayServer {
   GList *surfaces;
   BroadwaySurface *root;
   gint32 focused_surface_id; /* -1 => none */
-  gint show_keyboard;
+  int show_keyboard;
 
   guint32 next_texture_id;
   GHashTable *textures;
@@ -970,7 +970,7 @@ broadway_server_get_screen_size (BroadwayServer   *server,
 
 static void
 broadway_server_fake_roundtrip_reply (BroadwayServer *server,
-                                      gint            id,
+                                      int             id,
                                       guint32         tag)
 {
   BroadwayInputMsg msg;
@@ -1001,7 +1001,7 @@ broadway_server_flush (BroadwayServer *server)
 
 void
 broadway_server_roundtrip (BroadwayServer *server,
-                           gint            id,
+                           int             id,
                            guint32         tag)
 {
   if (server->output)
@@ -1565,7 +1565,7 @@ broadway_server_query_mouse (BroadwayServer *server,
 
 void
 broadway_server_destroy_surface (BroadwayServer *server,
-                                 gint id)
+                                 int id)
 {
   BroadwaySurface *surface;
 
@@ -1594,7 +1594,7 @@ broadway_server_destroy_surface (BroadwayServer *server,
 
 gboolean
 broadway_server_surface_show (BroadwayServer *server,
-                              gint id)
+                              int id)
 {
   BroadwaySurface *surface;
   gboolean sent = FALSE;
@@ -1616,7 +1616,7 @@ broadway_server_surface_show (BroadwayServer *server,
 
 gboolean
 broadway_server_surface_hide (BroadwayServer *server,
-                              gint id)
+                              int id)
 {
   BroadwaySurface *surface;
   gboolean sent = FALSE;
@@ -1646,7 +1646,7 @@ broadway_server_surface_hide (BroadwayServer *server,
 
 void
 broadway_server_surface_raise (BroadwayServer *server,
-                               gint id)
+                               int id)
 {
   BroadwaySurface *surface;
 
@@ -1676,7 +1676,7 @@ broadway_server_set_show_keyboard (BroadwayServer *server,
 
 void
 broadway_server_surface_lower (BroadwayServer *server,
-                               gint id)
+                               int id)
 {
   BroadwaySurface *surface;
 
@@ -1693,7 +1693,7 @@ broadway_server_surface_lower (BroadwayServer *server,
 
 void
 broadway_server_surface_set_transient_for (BroadwayServer *server,
-                                           gint id, gint parent)
+                                           int id, int parent)
 {
   BroadwaySurface *surface;
 
@@ -1865,7 +1865,7 @@ decode_nodes (BroadwayServer *server,
 /* passes ownership of nodes */
 void
 broadway_server_surface_update_nodes (BroadwayServer   *server,
-                                      gint              id,
+                                      int               id,
                                       guint32          data[],
                                       int              len,
                                       GHashTable      *client_texture_map)
@@ -1946,7 +1946,7 @@ broadway_server_release_texture (BroadwayServer   *server,
 
 gboolean
 broadway_server_surface_move_resize (BroadwayServer *server,
-                                     gint id,
+                                     int id,
                                      gboolean with_move,
                                      int x,
                                      int y,
@@ -1989,7 +1989,7 @@ broadway_server_surface_move_resize (BroadwayServer *server,
 
 void
 broadway_server_focus_surface (BroadwayServer *server,
-                               gint new_focused_surface)
+                               int new_focused_surface)
 {
   BroadwayInputMsg focus_msg;
 
@@ -2010,8 +2010,8 @@ broadway_server_focus_surface (BroadwayServer *server,
 
 guint32
 broadway_server_grab_pointer (BroadwayServer *server,
-                              gint client_id,
-                              gint id,
+                              int client_id,
+                              int id,
                               gboolean owner_events,
                               guint32 event_mask,
                               guint32 time_)
index 7c5d97e4aa2cc41d44d3e708502f4ad619cb864a..fd027a664ee824e0653dc9963f47cdd611f2d210 100644 (file)
@@ -60,7 +60,7 @@ gboolean            broadway_server_has_client                (BroadwayServer  *
 void                broadway_server_flush                     (BroadwayServer  *server);
 void                broadway_server_sync                      (BroadwayServer  *server);
 void                broadway_server_roundtrip                 (BroadwayServer  *server,
-                                                               gint             id,
+                                                               int              id,
                                                                guint32          tag);
 void                broadway_server_get_screen_size           (BroadwayServer  *server,
                                                                guint32         *width,
@@ -76,8 +76,8 @@ void                broadway_server_query_mouse               (BroadwayServer  *
                                                                gint32          *root_y,
                                                                guint32         *mask);
 guint32             broadway_server_grab_pointer              (BroadwayServer  *server,
-                                                               gint             client_id,
-                                                               gint             id,
+                                                               int              client_id,
+                                                               int              id,
                                                                gboolean         owner_events,
                                                                guint32          event_mask,
                                                                guint32          time_);
@@ -93,23 +93,23 @@ guint32             broadway_server_new_surface               (BroadwayServer  *
                                                                int              width,
                                                                int              height);
 void                broadway_server_destroy_surface           (BroadwayServer  *server,
-                                                               gint             id);
+                                                               int              id);
 gboolean            broadway_server_surface_show              (BroadwayServer  *server,
-                                                               gint             id);
+                                                               int              id);
 gboolean            broadway_server_surface_hide              (BroadwayServer  *server,
-                                                               gint             id);
+                                                               int              id);
 void                broadway_server_surface_raise             (BroadwayServer  *server,
-                                                               gint             id);
+                                                               int              id);
 void                broadway_server_surface_lower             (BroadwayServer  *server,
-                                                               gint             id);
+                                                               int              id);
 void                broadway_server_surface_set_transient_for (BroadwayServer  *server,
-                                                               gint             id,
-                                                               gint             parent);
+                                                               int              id,
+                                                               int              parent);
 gboolean            broadway_server_surface_translate         (BroadwayServer  *server,
-                                                               gint             id,
+                                                               int              id,
                                                                cairo_region_t  *area,
-                                                               gint             dx,
-                                                               gint             dy);
+                                                               int              dx,
+                                                               int              dy);
 guint32             broadway_server_upload_texture            (BroadwayServer  *server,
                                                                GBytes          *texture);
 void                broadway_server_release_texture           (BroadwayServer  *server,
@@ -117,19 +117,19 @@ void                broadway_server_release_texture           (BroadwayServer  *
 cairo_surface_t   * broadway_server_create_surface            (int              width,
                                                                int              height);
 void                broadway_server_surface_update_nodes      (BroadwayServer  *server,
-                                                               gint             id,
+                                                               int              id,
                                                                guint32          data[],
                                                                int              len,
                                                                GHashTable      *client_texture_map);
 gboolean            broadway_server_surface_move_resize       (BroadwayServer  *server,
-                                                               gint             id,
+                                                               int              id,
                                                                gboolean         with_move,
                                                                int              x,
                                                                int              y,
                                                                int              width,
                                                                int              height);
 void                broadway_server_focus_surface             (BroadwayServer  *server,
-                                                               gint             new_focused_surface);
+                                                               int              new_focused_surface);
 
 
 #endif /* __BROADWAY_SERVER__ */
index 6e235e1b528ed0b19349c4d0cec60ee90ea5d9d9..2807e6d46afdc9e547e5e293b2163a4b49d736b4 100644 (file)
@@ -501,7 +501,7 @@ _gdk_broadway_server_new_surface (GdkBroadwayServer *server,
 
 void
 _gdk_broadway_server_destroy_surface (GdkBroadwayServer *server,
-                                     gint id)
+                                     int id)
 {
   BroadwayRequestDestroySurface msg;
 
@@ -512,7 +512,7 @@ _gdk_broadway_server_destroy_surface (GdkBroadwayServer *server,
 
 gboolean
 _gdk_broadway_server_surface_show (GdkBroadwayServer *server,
-                                  gint id)
+                                  int id)
 {
   BroadwayRequestShowSurface msg;
 
@@ -525,7 +525,7 @@ _gdk_broadway_server_surface_show (GdkBroadwayServer *server,
 
 gboolean
 _gdk_broadway_server_surface_hide (GdkBroadwayServer *server,
-                                  gint id)
+                                  int id)
 {
   BroadwayRequestHideSurface msg;
 
@@ -538,7 +538,7 @@ _gdk_broadway_server_surface_hide (GdkBroadwayServer *server,
 
 void
 _gdk_broadway_server_surface_focus (GdkBroadwayServer *server,
-                                   gint id)
+                                   int id)
 {
   BroadwayRequestFocusSurface msg;
 
@@ -549,7 +549,7 @@ _gdk_broadway_server_surface_focus (GdkBroadwayServer *server,
 
 void
 _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer *server,
-                                               gint id, gint parent)
+                                               int id, int parent)
 {
   BroadwayRequestSetTransientFor msg;
 
@@ -692,7 +692,7 @@ gdk_broadway_server_surface_set_nodes (GdkBroadwayServer *server,
 
 gboolean
 _gdk_broadway_server_surface_move_resize (GdkBroadwayServer *server,
-                                         gint id,
+                                         int id,
                                          gboolean with_move,
                                          int x,
                                          int y,
@@ -716,7 +716,7 @@ _gdk_broadway_server_surface_move_resize (GdkBroadwayServer *server,
 
 GdkGrabStatus
 _gdk_broadway_server_grab_pointer (GdkBroadwayServer *server,
-                                   gint id,
+                                   int id,
                                    gboolean owner_events,
                                    guint32 event_mask,
                                    guint32 time_)
index 8bdcbb45c11d39ad502c995ffc1df7c7d0ed7283..0dd021103ad405a854518f681a3eb9d85049744f 100644 (file)
@@ -32,7 +32,7 @@ void               _gdk_broadway_server_query_mouse              (GdkBroadwaySer
                                                                  gint32             *root_y,
                                                                  guint32            *mask);
 GdkGrabStatus      _gdk_broadway_server_grab_pointer             (GdkBroadwayServer  *server,
-                                                                 gint                id,
+                                                                 int                 id,
                                                                  gboolean            owner_events,
                                                                  guint32             event_mask,
                                                                  guint32             time_);
@@ -45,23 +45,23 @@ guint32            _gdk_broadway_server_new_surface               (GdkBroadwaySe
                                                                  int                 width,
                                                                  int                 height);
 void               _gdk_broadway_server_destroy_surface           (GdkBroadwayServer  *server,
-                                                                 gint                id);
+                                                                 int                 id);
 gboolean           _gdk_broadway_server_surface_show              (GdkBroadwayServer  *server,
-                                                                 gint                id);
+                                                                 int                 id);
 gboolean           _gdk_broadway_server_surface_hide              (GdkBroadwayServer  *server,
-                                                                 gint                id);
+                                                                 int                 id);
 void               _gdk_broadway_server_surface_focus             (GdkBroadwayServer  *server,
-                                                                 gint                id);
+                                                                 int                 id);
 void               _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer  *server,
-                                                                 gint                id,
-                                                                 gint                parent);
+                                                                 int                 id,
+                                                                 int                 parent);
 void               _gdk_broadway_server_set_show_keyboard        (GdkBroadwayServer  *server,
                                                                  gboolean            show_keyboard);
 gboolean           _gdk_broadway_server_surface_translate         (GdkBroadwayServer  *server,
-                                                                 gint                id,
+                                                                 int                 id,
                                                                  cairo_region_t     *area,
-                                                                 gint                dx,
-                                                                 gint                dy);
+                                                                 int                 dx,
+                                                                 int                 dy);
 guint32             gdk_broadway_server_upload_texture           (GdkBroadwayServer  *server,
                                                                   GdkTexture         *texture);
 void                gdk_broadway_server_release_texture          (GdkBroadwayServer  *server,
@@ -70,7 +70,7 @@ void               gdk_broadway_server_surface_set_nodes          (GdkBroadwaySe
                                                                   guint32            id,
                                                                   GArray             *nodes);
 gboolean           _gdk_broadway_server_surface_move_resize       (GdkBroadwayServer  *server,
-                                                                 gint                id,
+                                                                 int                 id,
                                                                  gboolean            with_move,
                                                                  int                 x,
                                                                  int                 y,
index 3c2e98dbccc71c13b2d6d560da8da067d82f12ea..ae3b38fab5e006aff1606e0fa19ba330ea7760e0 100644 (file)
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 static gboolean gdk_event_source_prepare  (GSource     *source,
-                                           gint        *timeout);
+                                           int         *timeout);
 static gboolean gdk_event_source_check    (GSource     *source);
 static gboolean gdk_event_source_dispatch (GSource     *source,
                                            GSourceFunc  callback,
@@ -54,7 +54,7 @@ static GList *event_sources = NULL;
 
 static gboolean
 gdk_event_source_prepare (GSource *source,
-                          gint    *timeout)
+                          int     *timeout)
 {
   GdkDisplay *display = ((GdkEventSource*) source)->display;
   gboolean retval;
index 60d87156638de8e0ea683cf65f8a08bfa2a98eac..5fe3719ac78ae4e2ecda4c267f5a293d1ecdf9b4 100644 (file)
@@ -142,7 +142,7 @@ gdk_broadway_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
                                             guint          hardware_keycode,
                                             GdkKeymapKey **keys,
                                             guint        **keyvals,
-                                            gint          *n_entries)
+                                            int           *n_entries)
 {
   if (n_entries)
     *n_entries = 1;
@@ -171,10 +171,10 @@ static gboolean
 gdk_broadway_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                              guint            hardware_keycode,
                                              GdkModifierType  state,
-                                             gint             group,
+                                             int              group,
                                              guint           *keyval,
-                                             gint            *effective_group,
-                                             gint            *level,
+                                             int             *effective_group,
+                                             int             *level,
                                              GdkModifierType *consumed_modifiers)
 {
   if (keyval)
index 0a3b6d8b9d8dd8400976ddcbbffa515392363922..98d02958c8d07de08b1e6662b5cdbfba7710e2d7 100644 (file)
@@ -55,8 +55,8 @@ GdkDrag * _gdk_broadway_surface_drag_begin        (GdkSurface          *surface,
                                                    double              dy);
 void     _gdk_broadway_surface_translate          (GdkSurface *surface,
                                                    cairo_region_t *area,
-                                                   gint       dx,
-                                                   gint       dy);
+                                                   int        dx,
+                                                   int        dy);
 gboolean _gdk_broadway_moveresize_handle_event    (GdkDisplay *display,
                                                    BroadwayInputMsg *msg);
 gboolean _gdk_broadway_moveresize_configure_done  (GdkDisplay *display,
@@ -69,13 +69,13 @@ void     _gdk_broadway_surface_grab_check_unmap   (GdkSurface *surface,
                                                    gulong     serial);
 
 void gdk_broadway_surface_move_resize (GdkSurface *surface,
-                                       gint        x,
-                                       gint        y,
-                                       gint        width,
-                                       gint        height);
+                                       int         x,
+                                       int         y,
+                                       int         width,
+                                       int         height);
 
 void _gdk_keymap_keys_changed     (GdkDisplay      *display);
-gint _gdk_broadway_get_group_for_state (GdkDisplay      *display,
+int  _gdk_broadway_get_group_for_state (GdkDisplay      *display,
                                         GdkModifierType  state);
 void _gdk_keymap_add_virtual_modifiers_compat (GdkKeymap       *keymap,
                                                GdkModifierType *modifiers);
index 5b278ce7c3746127426116fccf3a596c90641793..8d7fb8d9547e4bb7d3dc980960474f625e8c9f7f 100644 (file)
@@ -405,7 +405,7 @@ gdk_broadway_surface_hide (GdkSurface *surface)
   _gdk_surface_clear_update_area (surface);
 }
 
-static gint
+static int
 gdk_broadway_surface_get_scale_factor (GdkSurface *surface)
 {
   GdkBroadwayDisplay *broadway_display;
@@ -456,10 +456,10 @@ sync_child_root_pos (GdkSurface *parent)
 static void
 gdk_broadway_surface_move_resize_internal (GdkSurface *surface,
                                            gboolean    with_move,
-                                           gint        x,
-                                           gint        y,
-                                           gint        width,
-                                           gint        height)
+                                           int         x,
+                                           int         y,
+                                           int         width,
+                                           int         height)
 {
   GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface);
   GdkBroadwayDisplay *broadway_display;
@@ -522,10 +522,10 @@ gdk_broadway_surface_move_resize_internal (GdkSurface *surface,
 
 void
 gdk_broadway_surface_move_resize (GdkSurface *surface,
-                                  gint        x,
-                                  gint        y,
-                                  gint        width,
-                                  gint        height)
+                                  int         x,
+                                  int         y,
+                                  int         width,
+                                  int         height)
 {
   gdk_broadway_surface_move_resize_internal (surface, TRUE,
                                              x, y,
@@ -534,8 +534,8 @@ gdk_broadway_surface_move_resize (GdkSurface *surface,
 
 static void
 gdk_broadway_surface_toplevel_resize (GdkSurface *surface,
-                                      gint        width,
-                                      gint        height)
+                                      int         width,
+                                      int         height)
 {
   gdk_broadway_surface_move_resize_internal (surface, FALSE,
                                              0, 0,
@@ -544,8 +544,8 @@ gdk_broadway_surface_toplevel_resize (GdkSurface *surface,
 
 static void
 gdk_broadway_surface_move (GdkSurface *surface,
-                           gint        x,
-                           gint        y)
+                           int         x,
+                           int         y)
 {
   gdk_broadway_surface_move_resize_internal (surface, TRUE, x, y, -1, -1);
 }
@@ -696,10 +696,10 @@ gdk_broadway_surface_set_transient_for (GdkSurface *surface,
 
 static void
 gdk_broadway_surface_get_geometry (GdkSurface *surface,
-                                   gint       *x,
-                                   gint       *y,
-                                   gint       *width,
-                                   gint       *height)
+                                   int        *x,
+                                   int        *y,
+                                   int        *width,
+                                   int        *height)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -718,10 +718,10 @@ gdk_broadway_surface_get_geometry (GdkSurface *surface,
 
 static void
 gdk_broadway_surface_get_root_coords (GdkSurface *surface,
-                                      gint        x,
-                                      gint        y,
-                                      gint       *root_x,
-                                      gint       *root_y)
+                                      int         x,
+                                      int         y,
+                                      int        *root_x,
+                                      int        *root_y)
 {
   GdkBroadwaySurface *impl;
 
@@ -839,13 +839,13 @@ struct _MoveResizeData
   GdkSurface *moveresize_emulation_surface;
   gboolean is_resize;
   GdkSurfaceEdge resize_edge;
-  gint moveresize_button;
-  gint moveresize_x;
-  gint moveresize_y;
-  gint moveresize_orig_x;
-  gint moveresize_orig_y;
-  gint moveresize_orig_width;
-  gint moveresize_orig_height;
+  int moveresize_button;
+  int moveresize_x;
+  int moveresize_y;
+  int moveresize_orig_x;
+  int moveresize_orig_y;
+  int moveresize_orig_width;
+  int moveresize_orig_height;
   long moveresize_process_time;
   GdkSurfaceHints moveresize_geom_mask;
   GdkGeometry moveresize_geometry;
@@ -876,17 +876,17 @@ get_move_resize_data (GdkDisplay *display,
 
 static void
 update_pos (MoveResizeData *mv_resize,
-            gint            new_root_x,
-            gint            new_root_y)
+            int             new_root_x,
+            int             new_root_y)
 {
-  gint dx, dy;
+  int dx, dy;
 
   dx = new_root_x - mv_resize->moveresize_x;
   dy = new_root_y - mv_resize->moveresize_y;
 
   if (mv_resize->is_resize)
     {
-      gint x, y, w, h;
+      int x, y, w, h;
 
       x = mv_resize->moveresize_orig_x;
       y = mv_resize->moveresize_orig_y;
@@ -951,7 +951,7 @@ update_pos (MoveResizeData *mv_resize,
     }
   else
     {
-      gint x, y;
+      int x, y;
 
       x = mv_resize->moveresize_orig_x + dx;
       y = mv_resize->moveresize_orig_y + dy;
@@ -1129,7 +1129,7 @@ create_moveresize_surface (MoveResizeData *mv_resize,
 static void
 calculate_unmoving_origin (MoveResizeData *mv_resize)
 {
-  gint x, y, width, height;
+  int x, y, width, height;
 
   if (mv_resize->moveresize_geom_mask & GDK_HINT_WIN_GRAVITY &&
       mv_resize->moveresize_geometry.win_gravity == GDK_GRAVITY_STATIC)
index e32e60ec31a585ed5a83a8cac10fc40bab135fd3..bb6c1fc457b7b8c26bf33e1b97ae3cfc0d60451b 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -403,7 +403,7 @@ gdk_unichar_direction (gunichar ch)
 
 PangoDirection
 gdk_find_base_dir (const gchar *text,
-                   gint         length)
+                   int          length)
 {
   PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
   const gchar *p;
index a3410f6cd82260dbdb1f3c18a4023f777357155c..a466209939540548e007263fae38857fbe881b56 100644 (file)
@@ -205,7 +205,7 @@ gdk_app_launch_context_get_display (GdkAppLaunchContext *context)
  */
 void
 gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
-                                    gint                 desktop)
+                                    int                  desktop)
 {
   g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context));
 
index 575a86750133a2e2b213ab5d1b6e3978f8f4dd62..73296592f452205d96f570513d60e92ff825bd0b 100644 (file)
@@ -43,7 +43,7 @@ GdkDisplay *         gdk_app_launch_context_get_display   (GdkAppLaunchContext *
 
 GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_desktop   (GdkAppLaunchContext *context,
-                                                           gint                 desktop);
+                                                           int                  desktop);
 GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
                                                            guint32              timestamp);
index 9a2bb7199b33e3c1a038af2f920e312f701c9357..e4262f1b5f09e3afd232f05c7aa3ed2f2c398bca 100644 (file)
@@ -35,7 +35,7 @@ struct _GdkAppLaunchContext
   GAppLaunchContext parent_instance;
 
   GdkDisplay *display;
-  gint workspace;
+  int workspace;
   guint32 timestamp;
   GIcon *icon;
   char *icon_name;
index e9fcdff08675aa0dbc50712f5696566573a1a33b..908fc75af882979130dd7ddc31d1ad483240b66a 100644 (file)
@@ -91,7 +91,7 @@ gdk_cairo_region (cairo_t              *cr,
                   const cairo_region_t *region)
 {
   cairo_rectangle_int_t box;
-  gint n_boxes, i;
+  int n_boxes, i;
 
   g_return_if_fail (cr != NULL);
   g_return_if_fail (region != NULL);
@@ -109,7 +109,7 @@ void
 gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface,
                                 const GdkPixbuf *pixbuf)
 {
-  gint width, height;
+  int width, height;
   guchar *gdk_pixels, *cairo_pixels;
   int gdk_rowstride, cairo_stride;
   int n_channels;
@@ -312,7 +312,7 @@ gdk_cairo_region_create_from_surface (cairo_surface_t *surface)
   GdkRectangle extents, rect;
   cairo_surface_t *image;
   cairo_t *cr;
-  gint x, y, stride;
+  int x, y, stride;
   guchar *data;
 
   _gdk_cairo_surface_extents (surface, &extents);
@@ -347,7 +347,7 @@ gdk_cairo_region_create_from_surface (cairo_surface_t *surface)
       for (x = 0; x < extents.width; x++)
         {
           /* Search for a continuous range of "non transparent pixels"*/
-          gint x0 = x;
+          int x0 = x;
           while (x < extents.width)
             {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
index 4889d7b232089f14f0f1566d791e4af59958661c..5cddd20c788e6b8a22a527a7b5f67357c522a4e1 100644 (file)
@@ -850,7 +850,7 @@ gdk_device_get_device_type (GdkDevice *device)
  *
  * Returns: the number of axes.
  **/
-gint
+int
 gdk_device_get_n_axes (GdkDevice *device)
 {
   g_return_val_if_fail (GDK_IS_DEVICE (device), 0);
@@ -877,7 +877,7 @@ gdk_device_get_axis (GdkDevice  *device,
                      GdkAxisUse  use,
                      gdouble    *value)
 {
-  gint i;
+  int i;
 
   g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE);
   g_return_val_if_fail (device->source != GDK_SOURCE_KEYBOARD, FALSE);
@@ -980,7 +980,7 @@ gdk_device_ungrab (GdkDevice  *device,
 void
 _gdk_device_reset_axes (GdkDevice *device)
 {
-  gint i;
+  int i;
 
   for (i = device->axes->len - 1; i >= 0; i--)
     g_array_remove_index (device->axes, i);
@@ -1061,7 +1061,7 @@ find_axis_info (GArray     *array,
                 GdkAxisUse  use)
 {
   GdkAxisInfo *info;
-  gint i;
+  int i;
 
   for (i = 0; i < GDK_AXIS_LAST; i++)
     {
@@ -1089,7 +1089,7 @@ _gdk_device_translate_surface_coord (GdkDevice *device,
   gdouble x_min, y_min;
   gdouble x_resolution, y_resolution;
   gdouble device_aspect;
-  gint surface_width, surface_height;
+  int surface_width, surface_height;
 
   if (index_ >= device->axes->len)
     return FALSE;
index b9206fcbabef0fc5e2c2ad935aa5d86cf575e311..caa557c2667e2455f82c0ef76d05308c8b5caba0 100644 (file)
@@ -124,7 +124,7 @@ GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device,
                                                  double    *win_y);
 
 GDK_AVAILABLE_IN_ALL
-gint     gdk_device_get_n_axes     (GdkDevice       *device);
+int      gdk_device_get_n_axes     (GdkDevice       *device);
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_device_get_axis     (GdkDevice         *device,
                                   gdouble           *axes,
index aa0642e292416bb8046b0853cca5b85e18d30832..05b620a52b14ff7ef42cd7e71f9df629f2b620c8 100644 (file)
@@ -73,7 +73,7 @@ gdk_device_pad_default_init (GdkDevicePadInterface *pad)
  *
  * Returns: The number of button/ring/strip groups in the pad.
  **/
-gint
+int
 gdk_device_pad_get_n_groups (GdkDevicePad *pad)
 {
   GdkDevicePadInterface *iface = GDK_DEVICE_PAD_GET_IFACE (pad);
@@ -92,9 +92,9 @@ gdk_device_pad_get_n_groups (GdkDevicePad *pad)
  *
  * Returns: The number of modes available in @group.
  **/
-gint
+int
 gdk_device_pad_get_group_n_modes (GdkDevicePad *pad,
-                                  gint          group_idx)
+                                  int           group_idx)
 {
   GdkDevicePadInterface *iface = GDK_DEVICE_PAD_GET_IFACE (pad);
 
@@ -113,7 +113,7 @@ gdk_device_pad_get_group_n_modes (GdkDevicePad *pad,
  *
  * Returns: The amount of elements of type @feature that this pad has.
  **/
-gint
+int
 gdk_device_pad_get_n_features (GdkDevicePad        *pad,
                                GdkDevicePadFeature  feature)
 {
@@ -135,10 +135,10 @@ gdk_device_pad_get_n_features (GdkDevicePad        *pad,
  *
  * Returns: The group number of the queried pad feature.
  **/
-gint
+int
 gdk_device_pad_get_feature_group (GdkDevicePad        *pad,
                                   GdkDevicePadFeature  feature,
-                                  gint                 idx)
+                                  int                  idx)
 {
   GdkDevicePadInterface *iface = GDK_DEVICE_PAD_GET_IFACE (pad);
 
index 475e51a45aa52f6ceb3f9c3331e0045930fd6e97..f8d6da1a761cb4454d77709b6764317d3892b8b3 100644 (file)
@@ -54,20 +54,20 @@ GDK_AVAILABLE_IN_ALL
 GType gdk_device_pad_get_type          (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-gint  gdk_device_pad_get_n_groups      (GdkDevicePad *pad);
+int   gdk_device_pad_get_n_groups      (GdkDevicePad *pad);
 
 GDK_AVAILABLE_IN_ALL
-gint  gdk_device_pad_get_group_n_modes (GdkDevicePad *pad,
-                                        gint          group_idx);
+int   gdk_device_pad_get_group_n_modes (GdkDevicePad *pad,
+                                        int           group_idx);
 
 GDK_AVAILABLE_IN_ALL
-gint  gdk_device_pad_get_n_features    (GdkDevicePad        *pad,
+int   gdk_device_pad_get_n_features    (GdkDevicePad        *pad,
                                         GdkDevicePadFeature  feature);
 
 GDK_AVAILABLE_IN_ALL
-gint  gdk_device_pad_get_feature_group (GdkDevicePad        *pad,
+int   gdk_device_pad_get_feature_group (GdkDevicePad        *pad,
                                         GdkDevicePadFeature  feature,
-                                        gint                 feature_idx);
+                                        int                  feature_idx);
 
 G_END_DECLS
 
index a4f190066b2c2107cc433aededb5d455ec3c5a48..7a4371f9bd38eb04340848abd8aebea01289011e 100644 (file)
@@ -29,15 +29,15 @@ G_BEGIN_DECLS
 struct _GdkDevicePadInterface {
   GTypeInterface parent_interface;
 
-  gint (* get_n_groups)      (GdkDevicePad        *pad);
+  int (* get_n_groups)       (GdkDevicePad        *pad);
 
-  gint (* get_group_n_modes) (GdkDevicePad        *pad,
-                              gint                 group);
-  gint (* get_n_features)    (GdkDevicePad        *pad,
+  int (* get_group_n_modes)  (GdkDevicePad        *pad,
+                              int                  group);
+  int (* get_n_features)     (GdkDevicePad        *pad,
                               GdkDevicePadFeature  feature);
-  gint (* get_feature_group) (GdkDevicePad        *pad,
+  int (* get_feature_group)  (GdkDevicePad        *pad,
                               GdkDevicePadFeature  feature,
-                              gint                 idx);
+                              int                  idx);
 };
 
 G_END_DECLS
index 712ab70581c19c4c046a8a7f142ac470e8ac75b2..3c3140691a3c6301d26bc15f22ca88abaf33929d 100644 (file)
@@ -130,7 +130,7 @@ gboolean   _gdk_device_translate_axis         (GdkDevice *device,
                                                gdouble   *axis_value);
 
 GdkTimeCoord ** _gdk_device_allocate_history  (GdkDevice *device,
-                                               gint       n_events);
+                                               int        n_events);
 
 void    _gdk_device_add_physical_device         (GdkDevice *device,
                                                  GdkDevice *physical);
index a17305fcbe50881142707e4929cbd179d237e4f7..db7dfa19ea7fff0d9d8e21bc74105df864478414 100644 (file)
@@ -394,7 +394,7 @@ gdk_display_manager_open_display (GdkDisplayManager *manager,
   const gchar *backend_list;
   GdkDisplay *display;
   gchar **backends;
-  gint i, j;
+  int i, j;
   gboolean allow_any;
 
   if (allowed_backends == NULL)
index 31f947d8b1755f665584a352adfc8cf2be785691..c1eac41ac443e86a747ba5eccc70c56cf5c72f51 100644 (file)
@@ -722,8 +722,8 @@ gdk_drag_get_drag_surface (GdkDrag *drag)
  */
 void
 gdk_drag_set_hotspot (GdkDrag *drag,
-                      gint     hot_x,
-                      gint     hot_y)
+                      int      hot_x,
+                      int      hot_y)
 {
   g_return_if_fail (GDK_IS_DRAG (drag));
 
@@ -807,7 +807,7 @@ GdkCursor *
 gdk_drag_get_cursor (GdkDrag       *drag,
                      GdkDragAction  action)
 {
-  gint i;
+  int i;
 
   for (i = 0 ; i < G_N_ELEMENTS (drag_cursors) - 1; i++)
     if (drag_cursors[i].action == action)
index a3aea2ad7e2c333f4f9cfc326a26cb1d7835c74f..070b0f812d0ea64326beb3174780639de2e6969c 100644 (file)
@@ -88,8 +88,8 @@ GdkSurface      *gdk_drag_get_drag_surface (GdkDrag *drag);
 
 GDK_AVAILABLE_IN_ALL
 void            gdk_drag_set_hotspot (GdkDrag *drag,
-                                      gint     hot_x,
-                                      gint     hot_y);
+                                      int      hot_x,
+                                      int      hot_y);
 
 GDK_AVAILABLE_IN_ALL
 GdkContentProvider *
index ec781204d588b8cb612fd30b6014e43d74631e8a..2532caad8bf6dd224d764d09bf5b35fea0773455 100644 (file)
@@ -35,8 +35,8 @@ struct _GdkDragClass {
 
   GdkSurface*  (*get_drag_surface) (GdkDrag *drag);
   void        (*set_hotspot)   (GdkDrag  *drag,
-                                gint             hot_x,
-                                gint             hot_y);
+                                int              hot_x,
+                                int              hot_y);
   void        (*drop_done)     (GdkDrag   *drag,
                                 gboolean          success);
 
index b6d952264dc53c8572dec750427faa5e6073ddfa..264c62f06c8acf87e0ccf4e961fa2c5d301279ea 100644 (file)
@@ -734,7 +734,7 @@ gdk_motion_event_push_history (GdkEvent *event,
   GdkMotionEvent *self = (GdkMotionEvent *) event;
   GdkTimeCoord hist;
   GdkDevice *device;
-  gint i, n_axes;
+  int i, n_axes;
 
   g_assert (GDK_IS_EVENT_TYPE (event, GDK_MOTION_NOTIFY));
   g_assert (GDK_IS_EVENT_TYPE (history_event, GDK_MOTION_NOTIFY));
index 9a48df379e5a8ed362acb7cb75c37dcacc1acb41..cd10511545aee39786bec8f07f45f33532d097d6 100644 (file)
@@ -94,10 +94,10 @@ static guint fps_counter;
 struct _GdkFrameClockPrivate
 {
   gint64 frame_counter;
-  gint n_timings;
-  gint current;
+  int n_timings;
+  int current;
   GdkFrameTimings *timings[FRAME_HISTORY_MAX_LENGTH];
-  gint n_freeze_inhibitors;
+  int n_freeze_inhibitors;
 };
 
 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkFrameClock, gdk_frame_clock, G_TYPE_OBJECT)
@@ -489,7 +489,7 @@ gdk_frame_clock_get_timings (GdkFrameClock *frame_clock,
                              gint64         frame_counter)
 {
   GdkFrameClockPrivate *priv;
-  gint pos;
+  int pos;
 
   g_return_val_if_fail (GDK_IS_FRAME_CLOCK (frame_clock), NULL);
 
index ec66950b7092c40decd0feb8498bd39ca572b388..fe2de4667eb24a4709a0fa1a97dadc6c2eef669c 100644 (file)
@@ -85,7 +85,7 @@ static GSource *sleep_source;
 
 static gboolean
 sleep_source_prepare (GSource *source,
-                      gint    *timeout)
+                      int     *timeout)
 {
   sleep_source_prepare_time = g_source_get_time (source);
   *timeout = -1;
index c42728573e4567959baac0803a62901ebe6e418c..a4d85365fdf604d8a3ee4e67ad77f134b3443fe1 100644 (file)
@@ -271,20 +271,20 @@ void gdk_device_get_position  (GdkDevice        *device,
 
 
 void gdk_surface_get_root_coords (GdkSurface *surface,
-                                  gint        x,
-                                  gint        y,
-                                  gint       *root_x,
-                                  gint       *root_y);
+                                  int         x,
+                                  int         y,
+                                  int        *root_x,
+                                  int        *root_y);
 void gdk_surface_get_origin      (GdkSurface *surface,
-                                  gint       *x,
-                                  gint       *y);
+                                  int        *x,
+                                  int        *y);
 
 
 void gdk_surface_get_geometry (GdkSurface *surface,
-                               gint       *x,
-                               gint       *y,
-                               gint       *width,
-                               gint       *height);
+                               int        *x,
+                               int        *y,
+                               int        *width,
+                               int        *height);
 
 GdkGLContext *gdk_surface_get_shared_data_gl_context (GdkSurface *surface);
 
@@ -323,14 +323,14 @@ typedef struct _GdkGeometry GdkGeometry;
 
 struct _GdkGeometry
 {
-  gint min_width;
-  gint min_height;
-  gint max_width;
-  gint max_height;
-  gint base_width;
-  gint base_height;
-  gint width_inc;
-  gint height_inc;
+  int min_width;
+  int min_height;
+  int max_width;
+  int max_height;
+  int base_width;
+  int base_height;
+  int width_inc;
+  int height_inc;
   gdouble min_aspect;
   gdouble max_aspect;
   GdkGravity win_gravity;
@@ -339,10 +339,10 @@ struct _GdkGeometry
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_constrain_size      (GdkGeometry    *geometry,
                                             GdkSurfaceHints  flags,
-                                            gint            width,
-                                            gint            height,
-                                            gint           *new_width,
-                                            gint           *new_height);
+                                            int             width,
+                                            int             height,
+                                            int            *new_width,
+                                            int            *new_height);
 
 /*
  * GdkSeatGrabPrepareFunc:
@@ -376,16 +376,16 @@ GdkKeymap *  gdk_display_get_keymap  (GdkDisplay *display);
 void gdk_surface_begin_resize_drag            (GdkSurface     *surface,
                                                GdkSurfaceEdge  edge,
                                                GdkDevice      *device,
-                                               gint            button,
-                                               gint            x,
-                                               gint            y,
+                                               int             button,
+                                               int             x,
+                                               int             y,
                                                guint32         timestamp);
 
 void gdk_surface_begin_move_drag              (GdkSurface     *surface,
                                                GdkDevice      *device,
-                                               gint            button,
-                                               gint            x,
-                                               gint            y,
+                                               int             button,
+                                               int             x,
+                                               int             y,
                                                guint32         timestamp);
 
 G_END_DECLS
index 52bba82bb2ecd35f2fc15d2c097c3afb03545240..ac85d1da7499c4198b07151358c0715a2cd8bff2 100644 (file)
@@ -541,7 +541,7 @@ gboolean
 gdk_keymap_get_entries_for_keyval (GdkKeymap     *keymap,
                                    guint          keyval,
                                    GdkKeymapKey **keys,
-                                   gint          *n_keys)
+                                   int           *n_keys)
 {
   GArray *array;
 
@@ -621,7 +621,7 @@ gdk_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
                                     guint          hardware_keycode,
                                     GdkKeymapKey **keys,
                                     guint        **keyvals,
-                                    gint          *n_entries)
+                                    int           *n_entries)
 {
   g_return_val_if_fail (GDK_IS_KEYMAP (keymap), FALSE);
   g_return_val_if_fail (n_entries != NULL, FALSE);
@@ -723,10 +723,10 @@ gboolean
 gdk_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                      guint            hardware_keycode,
                                      GdkModifierType  state,
-                                     gint             group,
+                                     int              group,
                                      guint           *keyval,
-                                     gint            *effective_group,
-                                     gint            *level,
+                                     int             *effective_group,
+                                     int             *level,
                                      GdkModifierType *consumed_modifiers)
 {
   g_return_val_if_fail (GDK_IS_KEYMAP (keymap), FALSE);
index 79ad146b14b5cb42e0731afef1299aa6278ad43e..db05785678fe049e09af60bbddeef57b1c00ebf7 100644 (file)
@@ -48,16 +48,16 @@ struct _GdkKeymapClass
                                          guint          hardware_keycode,
                                          GdkKeymapKey **keys,
                                          guint        **keyvals,
-                                         gint          *n_entries);
+                                         int           *n_entries);
   guint (* lookup_key)                  (GdkKeymap          *keymap,
                                          const GdkKeymapKey *key);
   gboolean (* translate_keyboard_state) (GdkKeymap       *keymap,
                                          guint            hardware_keycode,
                                          GdkModifierType  state,
-                                         gint             group,
+                                         int              group,
                                          guint           *keyval,
-                                         gint            *effective_group,
-                                         gint            *level,
+                                         int             *effective_group,
+                                         int             *level,
                                          GdkModifierType *consumed_modifiers);
   guint (* get_modifier_state)          (GdkKeymap *keymap);
 
@@ -94,20 +94,20 @@ guint          gdk_keymap_lookup_key               (GdkKeymap           *keymap,
 gboolean       gdk_keymap_translate_keyboard_state (GdkKeymap           *keymap,
                                                     guint                hardware_keycode,
                                                     GdkModifierType      state,
-                                                    gint                 group,
+                                                    int                  group,
                                                     guint               *keyval,
-                                                    gint                *effective_group,
-                                                    gint                *level,
+                                                    int                 *effective_group,
+                                                    int                 *level,
                                                     GdkModifierType     *consumed_modifiers);
 gboolean       gdk_keymap_get_entries_for_keyval   (GdkKeymap           *keymap,
                                                     guint                keyval,
                                                     GdkKeymapKey       **keys,
-                                                    gint                *n_keys);
+                                                    int                 *n_keys);
 gboolean       gdk_keymap_get_entries_for_keycode  (GdkKeymap           *keymap,
                                                     guint                hardware_keycode,
                                                     GdkKeymapKey       **keys,
                                                     guint              **keyvals,
-                                                    gint                *n_entries);
+                                                    int                 *n_entries);
 
 PangoDirection gdk_keymap_get_direction            (GdkKeymap           *keymap);
 gboolean       gdk_keymap_have_bidi_layouts        (GdkKeymap           *keymap);
index 443afed7badb24627028d780b307179e98f2a861..38999a3af17bfd84efa94bd883eb0abe32e4f737 100644 (file)
  */
 static cairo_region_t*
 layout_iter_get_line_clip_region (PangoLayoutIter *iter,
-                                 gint             x_origin,
-                                 gint             y_origin,
-                                 const gint      *index_ranges,
-                                 gint             n_ranges)
+                                 int              x_origin,
+                                 int              y_origin,
+                                 const int       *index_ranges,
+                                 int              n_ranges)
 {
   PangoLayoutLine *line;
   cairo_region_t *clip_region;
   PangoRectangle logical_rect;
-  gint baseline;
-  gint i;
+  int baseline;
+  int i;
 
   line = pango_layout_iter_get_line_readonly (iter);
 
@@ -148,9 +148,9 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter,
   i = 0;
   while (i < n_ranges)
     {  
-      gint *pixel_ranges = NULL;
-      gint n_pixel_ranges = 0;
-      gint j;
+      int *pixel_ranges = NULL;
+      int n_pixel_ranges = 0;
+      int j;
 
       /* Note that get_x_ranges returns layout coordinates
        */
@@ -212,10 +212,10 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter,
  **/
 cairo_region_t*
 gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
-                                       gint             x_origin,
-                                       gint             y_origin,
-                                       const gint      *index_ranges,
-                                       gint             n_ranges)
+                                       int              x_origin,
+                                       int              y_origin,
+                                       const int       *index_ranges,
+                                       int              n_ranges)
 {
   cairo_region_t *clip_region;
   PangoLayoutIter *iter;
@@ -256,10 +256,10 @@ gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
  **/
 cairo_region_t*
 gdk_pango_layout_get_clip_region (PangoLayout *layout,
-                                  gint         x_origin,
-                                  gint         y_origin,
-                                  const gint  *index_ranges,
-                                  gint         n_ranges)
+                                  int          x_origin,
+                                  int          y_origin,
+                                  const int   *index_ranges,
+                                  int          n_ranges)
 {
   PangoLayoutIter *iter;  
   cairo_region_t *clip_region;
@@ -275,7 +275,7 @@ gdk_pango_layout_get_clip_region (PangoLayout *layout,
     {
       PangoRectangle logical_rect;
       cairo_region_t *line_region;
-      gint baseline;
+      int baseline;
       
       pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
       baseline = pango_layout_iter_get_baseline (iter);      
index 1378e7892a8797ad60dcaf8f6ba8ee4f563d7349..5a674bc3d8432de9ab733921e8110faa82c8c07f 100644 (file)
@@ -35,16 +35,16 @@ G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
 cairo_region_t    *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line,
-                                                     gint             x_origin,
-                                                     gint             y_origin,
-                                                     const gint      *index_ranges,
-                                                     gint             n_ranges);
+                                                     int              x_origin,
+                                                     int              y_origin,
+                                                     const int       *index_ranges,
+                                                     int              n_ranges);
 GDK_AVAILABLE_IN_ALL
 cairo_region_t    *gdk_pango_layout_get_clip_region      (PangoLayout     *layout,
-                                                     gint             x_origin,
-                                                     gint             y_origin,
-                                                     const gint      *index_ranges,
-                                                     gint             n_ranges);
+                                                     int              x_origin,
+                                                     int              y_origin,
+                                                     const int       *index_ranges,
+                                                     int              n_ranges);
 
 G_END_DECLS
 
index f0477d5dff9a26428ab74e4ee3c1848bf5a60369..02147e4a121b303683ce3ebb8bb71f4e8400160d 100644 (file)
@@ -34,7 +34,7 @@ typedef struct _GdkIOPipe GdkIOPipe;
 
 struct _GdkIOPipe
 {
-  gint ref_count;
+  int ref_count;
 
   GMutex mutex;
   GCond cond;
index e90edc1f20b221109ed411333799a190f405f30b..3b7c717bb9686b8e3c7b3a0b772454c9135f166c 100644 (file)
@@ -169,10 +169,10 @@ convert_no_alpha (guchar *dest_data,
  */
 GdkPixbuf *
 gdk_pixbuf_get_from_surface  (cairo_surface_t *surface,
-                              gint             src_x,
-                              gint             src_y,
-                              gint             width,
-                              gint             height)
+                              int              src_x,
+                              int              src_y,
+                              int              width,
+                              int              height)
 {
   cairo_content_t content;
   GdkPixbuf *dest;
index c2538c96330abb98388ff474715451f3a50fb40b..65db8ebbc8a9f80db3a81e9ae16fc1c52e8a1b38 100644 (file)
@@ -40,10 +40,10 @@ G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface,
-                                        gint             src_x,
-                                        gint             src_y,
-                                        gint             width,
-                                        gint             height);
+                                        int              src_x,
+                                        int              src_y,
+                                        int              width,
+                                        int              height);
 GDK_AVAILABLE_IN_ALL
 GdkPixbuf *gdk_pixbuf_get_from_texture (GdkTexture      *texture);
 
index 641d093e6f794b764f2863c16ed10b17f6cdde89..edae51062581e819a42c7758e58d563c63585a1c 100644 (file)
@@ -67,7 +67,7 @@ gdk_rectangle_union (const GdkRectangle *src1,
                     const GdkRectangle *src2,
                     GdkRectangle       *dest)
 {
-  gint dest_x, dest_y;
+  int dest_x, dest_y;
   
   g_return_if_fail (src1 != NULL);
   g_return_if_fail (src2 != NULL);
@@ -102,9 +102,9 @@ gdk_rectangle_intersect (const GdkRectangle *src1,
                         const GdkRectangle *src2,
                         GdkRectangle       *dest)
 {
-  gint dest_x, dest_y;
-  gint dest_x2, dest_y2;
-  gint return_val;
+  int dest_x, dest_y;
+  int dest_x2, dest_y2;
+  int return_val;
 
   g_return_val_if_fail (src1 != NULL, FALSE);
   g_return_val_if_fail (src2 != NULL, FALSE);
index 96302ea63032080ccea8f2a6187e369d9fed2e5f..984003451471d082af6ac65bd47c120787e4d413 100644 (file)
@@ -140,7 +140,7 @@ static GdkMonitor *
 get_monitor_for_rect (GdkDisplay         *display,
                       const GdkRectangle *rect)
 {
-  gint biggest_area = G_MININT;
+  int biggest_area = G_MININT;
   GdkMonitor *best_monitor = NULL;
   GdkMonitor *monitor;
   GdkRectangle workarea;
@@ -168,7 +168,7 @@ get_monitor_for_rect (GdkDisplay         *display,
   return best_monitor;
 }
 
-static gint
+static int
 get_anchor_x_sign (GdkGravity anchor)
 {
   switch (anchor)
@@ -192,7 +192,7 @@ get_anchor_x_sign (GdkGravity anchor)
     }
 }
 
-static gint
+static int
 get_anchor_y_sign (GdkGravity anchor)
 {
   switch (anchor)
@@ -216,20 +216,20 @@ get_anchor_y_sign (GdkGravity anchor)
     }
 }
 
-static gint
-maybe_flip_position (gint      bounds_pos,
-                     gint      bounds_size,
-                     gint      rect_pos,
-                     gint      rect_size,
-                     gint      surface_size,
-                     gint      rect_sign,
-                     gint      surface_sign,
-                     gint      offset,
+static int
+maybe_flip_position (int       bounds_pos,
+                     int       bounds_size,
+                     int       rect_pos,
+                     int       rect_size,
+                     int       surface_size,
+                     int       rect_sign,
+                     int       surface_sign,
+                     int       offset,
                      gboolean  flip,
                      gboolean *flipped)
 {
-  gint primary;
-  gint secondary;
+  int primary;
+  int secondary;
 
   *flipped = FALSE;
   primary = rect_pos + (1 + rect_sign) * rect_size / 2 + offset - (1 + surface_sign) * surface_size / 2;
@@ -784,8 +784,8 @@ gdk_surface_new (GdkDisplay     *display,
  **/
 GdkSurface *
 gdk_surface_new_toplevel (GdkDisplay *display,
-                          gint        width,
-                          gint        height)
+                          int         width,
+                          int         height)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
 
@@ -1556,10 +1556,10 @@ gdk_surface_thaw_toplevel_updates (GdkSurface *surface)
 void
 gdk_surface_constrain_size (GdkGeometry    *geometry,
                             GdkSurfaceHints  flags,
-                            gint            width,
-                            gint            height,
-                            gint           *new_width,
-                            gint           *new_height)
+                            int             width,
+                            int             height,
+                            int            *new_width,
+                            int            *new_height)
 {
   /* This routine is partially borrowed from fvwm.
    *
@@ -1569,16 +1569,16 @@ gdk_surface_constrain_size (GdkGeometry    *geometry,
    *
    * which in turn borrows parts of the algorithm from uwm
    */
-  gint min_width = 0;
-  gint min_height = 0;
-  gint base_width = 0;
-  gint base_height = 0;
-  gint xinc = 1;
-  gint yinc = 1;
-  gint max_width = G_MAXINT;
-  gint max_height = G_MAXINT;
+  int min_width = 0;
+  int min_height = 0;
+  int base_width = 0;
+  int base_height = 0;
+  int xinc = 1;
+  int yinc = 1;
+  int max_width = G_MAXINT;
+  int max_height = G_MAXINT;
 
-#define FLOOR(value, base)      ( ((gint) ((value) / (base))) * (base) )
+#define FLOOR(value, base)      ( ((int) ((value) / (base))) * (base) )
 
   if ((flags & GDK_HINT_BASE_SIZE) && (flags & GDK_HINT_MIN_SIZE))
     {
@@ -1635,7 +1635,7 @@ gdk_surface_constrain_size (GdkGeometry    *geometry,
       geometry->min_aspect > 0 &&
       geometry->max_aspect > 0)
     {
-      gint delta;
+      int delta;
 
       if (flags & GDK_HINT_BASE_SIZE)
         {
@@ -1983,10 +1983,10 @@ gdk_surface_set_device_cursor (GdkSurface *surface,
  */
 void
 gdk_surface_get_geometry (GdkSurface *surface,
-                          gint      *x,
-                          gint      *y,
-                          gint      *width,
-                          gint      *height)
+                          int       *x,
+                          int       *y,
+                          int       *width,
+                          int       *height)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -2047,8 +2047,8 @@ gdk_surface_get_height (GdkSurface *surface)
  */
 void
 gdk_surface_get_origin (GdkSurface *surface,
-                        gint       *x,
-                        gint       *y)
+                        int        *x,
+                        int        *y)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -2070,10 +2070,10 @@ gdk_surface_get_origin (GdkSurface *surface,
  */
 void
 gdk_surface_get_root_coords (GdkSurface *surface,
-                             gint       x,
-                             gint       y,
-                             gint      *root_x,
-                             gint      *root_y)
+                             int        x,
+                             int        y,
+                             int       *root_x,
+                             int       *root_y)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -2528,7 +2528,7 @@ gdk_surface_get_frame_clock (GdkSurface *surface)
  *
  * Returns: the scale factor
  */
-gint
+int
 gdk_surface_get_scale_factor (GdkSurface *surface)
 {
   GdkSurfaceClass *class;
@@ -2554,7 +2554,7 @@ gdk_surface_get_unscaled_size (GdkSurface *surface,
                                int *unscaled_height)
 {
   GdkSurfaceClass *class;
-  gint scale;
+  int scale;
 
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -2637,10 +2637,10 @@ gdk_surface_set_opaque_region (GdkSurface      *surface,
  */
 void
 gdk_surface_set_shadow_width (GdkSurface *surface,
-                              gint       left,
-                              gint       right,
-                              gint       top,
-                              gint       bottom)
+                              int        left,
+                              int        right,
+                              int        top,
+                              int        bottom)
 {
   GdkSurfaceClass *class;
 
index 5b10920291fdfe387a7343ff00adb7ca860a692d..acd766b259422df7de4d799e7ba3bbc14311dfbe 100644 (file)
@@ -186,7 +186,7 @@ gboolean gdk_surface_translate_coordinates (GdkSurface *from,
                                             double     *y);
 
 GDK_AVAILABLE_IN_ALL
-gint          gdk_surface_get_scale_factor  (GdkSurface     *surface);
+int           gdk_surface_get_scale_factor  (GdkSurface     *surface);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_get_device_position (GdkSurface      *surface,
@@ -222,10 +222,10 @@ void       gdk_surface_set_opaque_region        (GdkSurface      *surface,
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_set_shadow_width         (GdkSurface      *surface,
-                                                 gint            left,
-                                                 gint            right,
-                                                 gint            top,
-                                                 gint            bottom);
+                                                 int             left,
+                                                 int             right,
+                                                 int             top,
+                                                 int             bottom);
 
 GDK_AVAILABLE_IN_ALL
 GdkCairoContext *gdk_surface_create_cairo_context(GdkSurface    *surface);
index 2aa1828a3599125f812069a58fcac688d7255b5a..b3a8457a58b6b2312adaa53780f572c5c173b0ca 100644 (file)
@@ -45,8 +45,8 @@ struct _GdkSurface
 
   gpointer widget;
 
-  gint x;
-  gint y;
+  int x;
+  int y;
 
   guint8 resize_count;
 
@@ -81,11 +81,11 @@ struct _GdkSurface
 
   guint update_and_descendants_freeze_count;
 
-  gint width, height;
-  gint shadow_top;
-  gint shadow_left;
-  gint shadow_right;
-  gint shadow_bottom;
+  int width, height;
+  int shadow_top;
+  int shadow_left;
+  int shadow_right;
+  int shadow_bottom;
 
   GdkCursor *cursor;
   GHashTable *device_cursor;
@@ -114,15 +114,15 @@ struct _GdkSurfaceClass
 
   void         (* hide)                 (GdkSurface       *surface);
   void         (* get_geometry)         (GdkSurface       *surface,
-                                         gint            *x,
-                                         gint            *y,
-                                         gint            *width,
-                                         gint            *height);
+                                         int             *x,
+                                         int             *y,
+                                         int             *width,
+                                         int             *height);
   void         (* get_root_coords)      (GdkSurface       *surface,
-                                         gint             x,
-                                         gint             y,
-                                         gint            *root_x,
-                                         gint            *root_y);
+                                         int              x,
+                                         int              y,
+                                         int             *root_x,
+                                         int             *root_y);
   gboolean     (* get_device_state)     (GdkSurface       *surface,
                                          GdkDevice       *device,
                                          gdouble         *x,
@@ -155,7 +155,7 @@ struct _GdkSurfaceClass
                                          double              dx,
                                          double              dy);
 
-  gint         (* get_scale_factor)       (GdkSurface      *surface);
+  int          (* get_scale_factor)       (GdkSurface      *surface);
   void         (* get_unscaled_size)      (GdkSurface      *surface,
                                            int            *unscaled_width,
                                            int            *unscaled_height);
@@ -163,10 +163,10 @@ struct _GdkSurfaceClass
   void         (* set_opaque_region)      (GdkSurface      *surface,
                                            cairo_region_t *region);
   void         (* set_shadow_width)       (GdkSurface      *surface,
-                                           gint            left,
-                                           gint            right,
-                                           gint            top,
-                                           gint            bottom);
+                                           int             left,
+                                           int             right,
+                                           int             top,
+                                           int             bottom);
   GdkGLContext *(*create_gl_context)      (GdkSurface      *surface,
                                            gboolean        attached,
                                            GdkGLContext   *share,
index 9ad787936794c0784eaf58c73732c95b874337d6..0a0068e181aa23028b2228b840f28483ca910a78 100644 (file)
@@ -62,8 +62,8 @@ G_BEGIN_DECLS
  */
 struct _GdkPoint
 {
-  gint x;
-  gint y;
+  int x;
+  int y;
 };
 typedef struct _GdkPoint              GdkPoint;
 
@@ -405,8 +405,8 @@ typedef struct _GdkKeymapKey GdkKeymapKey;
 struct _GdkKeymapKey
 {
   guint keycode;
-  gint  group;
-  gint  level;
+  int   group;
+  int   level;
 };
 
 
index 6ba8780bc826976bb7786c0b802cfd16ac3ef300..f226e9443c0d5ae3347277cee3f2fb0ab4a664d7 100644 (file)
 {
   GdkMacosSurface *surface = gdk_surface;
   NSRect rect;
-  gint shadow_top;
+  int shadow_top;
 
   /* Allow the window to move up "shadow_top" more than normally allowed
    * by the default impl. This makes it possible to move windows with
index ba8731de5aff1bf27fb0b50a2461fdbc3ce8ffdf..36decbbaad60c36c7fc76e9e4a64570b682d97b7 100644 (file)
@@ -32,7 +32,7 @@ static gint64 host_to_frame_clock_time (gint64 host_time);
 
 static gboolean
 gdk_display_link_source_prepare (GSource *source,
-                                 gint    *timeout_)
+                                 int     *timeout_)
 {
   GdkDisplayLinkSource *impl = (GdkDisplayLinkSource *)source;
   gint64 now;
index 8e621fa6fe38b56b2e1cffb1db442e28140a1830..3b77c7a7d08a50dd16fc20172591efaf96d9c3ec 100644 (file)
@@ -72,8 +72,8 @@ gdk_macos_device_surface_at_position (GdkDevice       *device,
   GdkMacosDisplay *display;
   GdkMacosSurface *surface;
   NSPoint point;
-  gint x;
-  gint y;
+  int x;
+  int y;
 
   g_assert (GDK_IS_MACOS_DEVICE (device));
   g_assert (win_x != NULL);
index 558e0b81e024bb97c62fb39feb2412cdb7dfe912..cf3224b6dbe714c5f2d6d9edd5c8bca016f7f1b6 100644 (file)
@@ -78,7 +78,7 @@ _gdk_macos_settings_load (GdkMacosSettings *settings)
   settings->double_click_time = fval * 1000;
 
   name = [[NSFont systemFontOfSize:0] familyName];
-  pt_size = (gint)[[NSFont userFontOfSize:0] pointSize];
+  pt_size = (int)[[NSFont userFontOfSize:0] pointSize];
   /* Let's try to use the "views" font size (12pt) by default. This is
    * used for lists/text/other "content" which is the largest parts of
    * apps, using the "regular control" size (13pt) looks a bit out of
index de1324c674e955fc0efe37c660537fc85fad7424..7cc70d921e1f0b31f5570e38f30cfc0c9153c153 100644 (file)
@@ -248,7 +248,7 @@ gdk_macos_drag_drop_performed (GdkDrag *drag,
 
 static void
 gdk_drag_get_current_actions (GdkModifierType  state,
-                              gint             button,
+                              int              button,
                               GdkDragAction    actions,
                               GdkDragAction   *suggested_action,
                               GdkDragAction   *possible_actions)
@@ -414,7 +414,7 @@ gdk_dnd_handle_key_event (GdkDrag  *drag,
   GdkMacosDrag *self = GDK_MACOS_DRAG (drag);
   GdkModifierType state;
   GdkDevice *pointer;
-  gint dx, dy;
+  int dx, dy;
 
   dx = dy = 0;
   state = gdk_event_get_modifier_state (event);
index f173433de428f4331d302819b86e6e428b17b130..b4ad1fe4718a899ed2624d7ca427b377778ff9a3 100644 (file)
@@ -89,7 +89,7 @@ static gboolean run_loop_polling_async = FALSE;
 /* Between run_loop_before_waiting() and run_loop_after_waiting();
  * max_prioritiy to pass to g_main_loop_check()
  */
-static gint run_loop_max_priority;
+static int run_loop_max_priority;
 
 /* Timer that we've added to wake up the run loop when a GLib timeout
  */
@@ -148,7 +148,7 @@ static NSAutoreleasePool *autorelease_pool;
  * a run loop iteration, so we need to detect that and avoid triggering
  * our "run the GLib main looop while the run loop is active machinery.
  */
-static gint getting_events = 0;
+static int getting_events = 0;
 
 /************************************************************
  *********              Select Thread               *********
@@ -199,7 +199,7 @@ static GPollFD *next_pollfds;
 static guint next_n_pollfds;
 
 /* Pipe used to wake up the select thread */
-static gint select_thread_wakeup_pipe[2];
+static int select_thread_wakeup_pipe[2];
 
 /* Run loop source used to wake up the main thread */
 static CFRunLoopSourceRef select_main_thread_source;
@@ -365,7 +365,7 @@ dump_poll_result (GPollFD *ufds,
                   guint    nfds)
 {
   GString *s;
-  gint i;
+  int i;
 
   s = g_string_new ("");
   for (i = 0; i < nfds; i++)
@@ -393,7 +393,7 @@ pollfds_equal (GPollFD *old_pollfds,
                GPollFD *new_pollfds,
                guint    new_n_pollfds)
 {
-  gint i;
+  int i;
 
   if (old_n_pollfds != new_n_pollfds)
     return FALSE;
@@ -417,15 +417,15 @@ pollfds_equal (GPollFD *old_pollfds,
  *   0: No file descriptors ready, asynchronous poll not needed
  * > 0: Number of file descriptors ready
  */
-static gint
+static int
 select_thread_start_poll (GPollFD *ufds,
                           guint    nfds,
-                          gint     timeout)
+                          int      timeout)
 {
-  gint n_ready;
+  int n_ready;
   gboolean have_new_pollfds = FALSE;
-  gint poll_fd_index = -1;
-  gint i;
+  int poll_fd_index = -1;
+  int i;
 
   for (i = 0; i < nfds; i++)
     if (ufds[i].fd == -1)
@@ -575,8 +575,8 @@ select_thread_start_poll (GPollFD *ufds,
 static int
 select_thread_collect_poll (GPollFD *ufds, guint nfds)
 {
-  gint i;
-  gint n_ready = 0;
+  int i;
+  int n_ready = 0;
 
   SELECT_THREAD_LOCK ();
 
@@ -640,7 +640,7 @@ _gdk_macos_event_source_get_pending (void)
 
 static gboolean
 gdk_macos_event_source_prepare (GSource *source,
-                                gint    *timeout)
+                                int     *timeout)
 {
   GdkMacosEventSource *event_source = (GdkMacosEventSource *)source;
   gboolean retval;
@@ -737,14 +737,14 @@ static GSourceFuncs event_funcs = {
  *********             Our Poll Function            *********
  ************************************************************/
 
-static gint
+static int
 poll_func (GPollFD *ufds,
            guint    nfds,
-           gint     timeout_)
+           int      timeout_)
 {
   NSEvent *event;
   NSDate *limit_date;
-  gint n_ready;
+  int n_ready;
 
   static GPollFD *last_ufds;
 
@@ -808,12 +808,12 @@ poll_func (GPollFD *ufds,
 /* Wrapper around g_main_context_query() that handles reallocating
  * run_loop_pollfds up to the proper size
  */
-static gint
+static int
 query_main_context (GMainContext *context,
                     int           max_priority,
                     int          *timeout)
 {
-  gint nfds;
+  int nfds;
 
   if (!run_loop_pollfds)
     {
@@ -869,8 +869,8 @@ static void
 run_loop_before_sources (void)
 {
   GMainContext *context = g_main_context_default ();
-  gint max_priority;
-  gint nfds;
+  int max_priority;
+  int nfds;
 
   /* Before we let the CFRunLoop process sources, we want to check if there
    * are any pending GLib main loop sources more urgent than
@@ -909,8 +909,8 @@ static void
 run_loop_before_waiting (void)
 {
   GMainContext *context = g_main_context_default ();
-  gint timeout;
-  gint n_ready;
+  int timeout;
+  int n_ready;
 
   /* At this point, the CFRunLoop is ready to wait. We start a GMain loop
    * iteration by calling the check() and query() stages. We start a
index c638c75179df80b7859676e00cd9ca8c5c7846b1..32654992009f449dd8cf466ce77d628bdfde4288 100644 (file)
@@ -394,12 +394,12 @@ gdk_macos_keymap_lookup_key (GdkKeymap          *keymap,
 
 static guint
 translate_keysym (guint            hardware_keycode,
-                  gint             group,
+                  int              group,
                   GdkModifierType  state,
-                  gint            *effective_group,
-                  gint            *effective_level)
+                  int             *effective_group,
+                  int             *effective_level)
 {
-  gint level;
+  int level;
   guint tmp_keyval;
 
   level = (state & GDK_SHIFT_MASK) ? 1 : 0;
@@ -463,7 +463,7 @@ gdk_macos_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
                                           guint          hardware_keycode,
                                           GdkKeymapKey **keys,
                                           guint        **keyvals,
-                                          gint          *n_entries)
+                                          int           *n_entries)
 {
   GArray *keys_array;
   GArray *keyvals_array;
@@ -527,10 +527,10 @@ static gboolean
 gdk_macos_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                            guint            hardware_keycode,
                                            GdkModifierType  state,
-                                           gint             group,
+                                           int              group,
                                            guint           *keyval,
-                                           gint            *effective_group,
-                                           gint            *level,
+                                           int             *effective_group,
+                                           int             *level,
                                            GdkModifierType *consumed_modifiers)
 {
   guint tmp_keyval;
index f5a52db3cbae0c6f19ac6a6fa34048f02cb6aa40..4d9aa4c053501705d4bbb338a42df9e7b88b35ed 100644 (file)
@@ -81,10 +81,10 @@ const char        *_gdk_macos_surface_get_title               (GdkMacosSurface
 void               _gdk_macos_surface_set_title               (GdkMacosSurface    *self,
                                                                const gchar        *title);
 void               _gdk_macos_surface_get_shadow              (GdkMacosSurface    *self,
-                                                               gint               *top,
-                                                               gint               *right,
-                                                               gint               *bottom,
-                                                               gint               *left);
+                                                               int                *top,
+                                                               int                *right,
+                                                               int                *bottom,
+                                                               int                *left);
 NSView            *_gdk_macos_surface_get_view                (GdkMacosSurface    *self);
 gboolean           _gdk_macos_surface_get_modal_hint          (GdkMacosSurface    *self);
 void               _gdk_macos_surface_set_modal_hint          (GdkMacosSurface    *self,
index 83fad33ffd23aeeb45f8d4b2bc56f48972c5b292..84c74b9d4624362f1e79e8103df72a9a99894884 100644 (file)
@@ -122,7 +122,7 @@ gdk_macos_surface_hide (GdkSurface *surface)
   _gdk_surface_clear_update_area (surface);
 }
 
-static gint
+static int
 gdk_macos_surface_get_scale_factor (GdkSurface *surface)
 {
   GdkMacosSurface *self = (GdkMacosSurface *)surface;
@@ -541,10 +541,10 @@ _gdk_macos_surface_new (GdkMacosDisplay   *display,
 
 void
 _gdk_macos_surface_get_shadow (GdkMacosSurface *self,
-                               gint            *top,
-                               gint            *right,
-                               gint            *bottom,
-                               gint            *left)
+                               int             *top,
+                               int             *right,
+                               int             *bottom,
+                               int             *left)
 {
 
   g_return_if_fail (GDK_IS_MACOS_SURFACE (self));
index 66a461dd6c540a6f6169d42c658a2873b7f5c012..3358a8184a2afbb672c5d27c5a2b206540a96070 100644 (file)
@@ -104,7 +104,7 @@ static const struct {
 static const gchar *
 name_fallback (const gchar *name)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < G_N_ELEMENTS (name_map); i++)
     {
index 524f17e277a74a307849800fe1f944c6badcdb28..13f03ca4b31fd88a1e6229976bea4b4db3b98c1d 100644 (file)
@@ -185,7 +185,7 @@ struct _GdkWaylandTabletData
 
   GdkWaylandTabletToolData *current_tool;
 
-  gint axis_indices[GDK_AXIS_LAST];
+  int axis_indices[GDK_AXIS_LAST];
   gdouble *axes;
 };
 
@@ -833,7 +833,7 @@ gdk_wayland_device_init (GdkWaylandDevice *device_core)
   _gdk_device_add_axis (device, GDK_AXIS_Y, 0, 0, 1);
 }
 
-static gint
+static int
 gdk_wayland_device_pad_get_n_groups (GdkDevicePad *pad)
 {
   GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
@@ -846,9 +846,9 @@ gdk_wayland_device_pad_get_n_groups (GdkDevicePad *pad)
   return g_list_length (data->mode_groups);
 }
 
-static gint
+static int
 gdk_wayland_device_pad_get_group_n_modes (GdkDevicePad *pad,
-                                          gint          n_group)
+                                          int           n_group)
 {
   GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
   GdkWaylandTabletPadGroupData *group;
@@ -865,7 +865,7 @@ gdk_wayland_device_pad_get_group_n_modes (GdkDevicePad *pad,
   return group->n_modes;
 }
 
-static gint
+static int
 gdk_wayland_device_pad_get_n_features (GdkDevicePad        *pad,
                                        GdkDevicePadFeature  feature)
 {
@@ -889,16 +889,16 @@ gdk_wayland_device_pad_get_n_features (GdkDevicePad        *pad,
     }
 }
 
-static gint
+static int
 gdk_wayland_device_pad_get_feature_group (GdkDevicePad        *pad,
                                           GdkDevicePadFeature  feature,
-                                          gint                 idx)
+                                          int                  idx)
 {
   GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad));
   GdkWaylandTabletPadGroupData *group;
   GdkWaylandTabletPadData *data;
   GList *l;
-  gint i;
+  int i;
 
   data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat),
                                     GDK_DEVICE (pad));
@@ -3344,7 +3344,7 @@ static void
 gdk_wayland_device_tablet_clone_tool_axes (GdkWaylandTabletData *tablet,
                                            GdkDeviceTool        *tool)
 {
-  gint axis_pos;
+  int axis_pos;
 
   g_object_freeze_notify (G_OBJECT (tablet->stylus_device));
   _gdk_device_reset_axes (tablet->stylus_device);
@@ -3404,8 +3404,8 @@ gdk_wayland_mimic_device_axes (GdkDevice *logical,
 {
   gdouble axis_min, axis_max, axis_resolution;
   GdkAxisUse axis_use;
-  gint axis_count;
-  gint i;
+  int axis_count;
+  int i;
 
   g_object_freeze_notify (G_OBJECT (logical));
   _gdk_device_reset_axes (logical);
@@ -3607,7 +3607,7 @@ tablet_tool_handle_pressure (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index = tablet->axis_indices[GDK_AXIS_PRESSURE];
+  int axis_index = tablet->axis_indices[GDK_AXIS_PRESSURE];
 
   _gdk_device_translate_axis (tablet->stylus_device, axis_index,
                               pressure, &tablet->axes[axis_index]);
@@ -3624,7 +3624,7 @@ tablet_tool_handle_distance (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index = tablet->axis_indices[GDK_AXIS_DISTANCE];
+  int axis_index = tablet->axis_indices[GDK_AXIS_DISTANCE];
 
   _gdk_device_translate_axis (tablet->stylus_device, axis_index,
                               distance, &tablet->axes[axis_index]);
@@ -3642,8 +3642,8 @@ tablet_tool_handle_tilt (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint xtilt_axis_index = tablet->axis_indices[GDK_AXIS_XTILT];
-  gint ytilt_axis_index = tablet->axis_indices[GDK_AXIS_YTILT];
+  int xtilt_axis_index = tablet->axis_indices[GDK_AXIS_XTILT];
+  int ytilt_axis_index = tablet->axis_indices[GDK_AXIS_YTILT];
 
   _gdk_device_translate_axis (tablet->stylus_device, xtilt_axis_index,
                               wl_fixed_to_double (xtilt),
@@ -3701,7 +3701,7 @@ tablet_tool_handle_rotation (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index = tablet->axis_indices[GDK_AXIS_ROTATION];
+  int axis_index = tablet->axis_indices[GDK_AXIS_ROTATION];
 
   _gdk_device_translate_axis (tablet->stylus_device, axis_index,
                               wl_fixed_to_double (degrees),
@@ -3720,7 +3720,7 @@ tablet_tool_handle_slider (void                      *data,
 {
   GdkWaylandTabletToolData *tool = data;
   GdkWaylandTabletData *tablet = tool->current_tablet;
-  gint axis_index = tablet->axis_indices[GDK_AXIS_SLIDER];
+  int axis_index = tablet->axis_indices[GDK_AXIS_SLIDER];
 
   _gdk_device_translate_axis (tablet->stylus_device, axis_index,
                               position, &tablet->axes[axis_index]);
@@ -4175,7 +4175,7 @@ tablet_pad_handle_button (void                     *data,
   GdkWaylandTabletPadData *pad = data;
   GdkWaylandTabletPadGroupData *group;
   GdkEvent *event;
-  gint n_group;
+  int n_group;
 
   GDK_SEAT_NOTE (pad->seat, EVENTS,
             g_message ("tablet pad handle button, pad = %p, button = %d, state = %d",
index 45f937dfaba32db4f8583da2bba5bce07b8fe664..22623042ebaddbf5bed7a636e37c24471cdf6c2f 100644 (file)
@@ -1072,7 +1072,7 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
 void
 gdk_wayland_display_set_cursor_theme (GdkDisplay  *display,
                                       const gchar *name,
-                                      gint         size)
+                                      int          size)
 {
   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display);
   struct wl_cursor_theme *theme;
@@ -1473,7 +1473,7 @@ struct _TranslationEntry {
   GType type;
   union {
     const char *s;
-    gint         i;
+    int          i;
     gboolean     b;
   } fallback;
 };
@@ -1798,7 +1798,7 @@ init_settings (GdkDisplay *display)
   GSettingsSchemaSource *source;
   GSettingsSchema *schema;
   GSettings *settings;
-  gint i;
+  int i;
 
   if (gdk_should_use_portal ())
     {
index db5e6a4fb3d98a76afa28691e753b2e6ba7b8fa1..7321b34a4e993952556dab919f11da7bf49b5537 100644 (file)
@@ -58,7 +58,7 @@ typedef struct _GdkWaylandSelection GdkWaylandSelection;
 typedef struct {
         gboolean     antialias;
         gboolean     hinting;
-        gint         dpi;
+        int          dpi;
         const gchar *rgba;
         const gchar *hintstyle;
 } GsdXftSettings;
index e09129f02f4172c5948a56df61f880c2e0983b06..05bf681717787bfa0747cf9f78d709c8185c2603 100644 (file)
@@ -51,8 +51,8 @@ struct _GdkWaylandDrag
   struct wl_data_source *data_source;
   struct wl_data_offer *offer;
   uint32_t serial;
-  gint hot_x;
-  gint hot_y;
+  int hot_x;
+  int hot_y;
 };
 
 struct _GdkWaylandDragClass
@@ -122,12 +122,12 @@ gdk_wayland_drag_get_drag_surface (GdkDrag *drag)
 
 static void
 gdk_wayland_drag_set_hotspot (GdkDrag *drag,
-                              gint     hot_x,
-                              gint     hot_y)
+                              int      hot_x,
+                              int      hot_y)
 {
   GdkWaylandDrag *drag_wayland = GDK_WAYLAND_DRAG (drag);
-  gint prev_hot_x = drag_wayland->hot_x;
-  gint prev_hot_y = drag_wayland->hot_y;
+  int prev_hot_x = drag_wayland->hot_x;
+  int prev_hot_y = drag_wayland->hot_y;
   const GdkRectangle damage_rect = { .width = 1, .height = 1 };
 
   drag_wayland->hot_x = hot_x;
index 8db92954e8d60c24e67958583e32768c23289f87..6f761f0ab78a74422abcc30893e914e5a8d37022 100644 (file)
@@ -33,7 +33,7 @@ typedef struct _GdkWaylandEventSource {
 
 static gboolean
 gdk_event_source_prepare (GSource *base,
-                          gint    *timeout)
+                          int     *timeout)
 {
   GdkWaylandEventSource *source = (GdkWaylandEventSource *) base;
   GdkWaylandDisplay *display = (GdkWaylandDisplay *) source->display;
index c60dada58b36900de5c0bdeda605a83366a0cdbc..38f346c75df150b27f590b4477651fffdeb3869b 100644 (file)
@@ -84,7 +84,7 @@ static PangoDirection
 gdk_wayland_keymap_get_direction (GdkKeymap *keymap)
 {
   GdkWaylandKeymap *keymap_wayland = GDK_WAYLAND_KEYMAP (keymap);
-  gint i;
+  int i;
 
   for (i = 0; i < xkb_keymap_num_layouts (keymap_wayland->xkb_keymap); i++)
     {
@@ -138,16 +138,16 @@ gdk_wayland_keymap_get_entries_for_keyval (GdkKeymap *keymap,
   max_keycode = xkb_keymap_max_keycode (xkb_keymap);
   for (keycode = min_keycode; keycode < max_keycode; keycode++)
     {
-      gint num_layouts, layout;
+      int num_layouts, layout;
       num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, keycode);
       for (layout = 0; layout < num_layouts; layout++)
         {
-          gint num_levels, level;
+          int num_levels, level;
           num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, keycode, layout);
           for (level = 0; level < num_levels; level++)
             {
               const xkb_keysym_t *syms;
-              gint num_syms, sym;
+              int num_syms, sym;
               num_syms = xkb_keymap_key_get_syms_by_level (xkb_keymap, keycode, layout, level, &syms);
               for (sym = 0; sym < num_syms; sym++)
                 {
@@ -174,12 +174,12 @@ gdk_wayland_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
                                            guint          hardware_keycode,
                                            GdkKeymapKey **keys,
                                            guint        **keyvals,
-                                           gint          *n_entries)
+                                           int           *n_entries)
 {
   struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap;
-  gint num_layouts, layout;
-  gint num_entries;
-  gint i;
+  int num_layouts, layout;
+  int num_entries;
+  int i;
 
   num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, hardware_keycode);
 
@@ -197,7 +197,7 @@ gdk_wayland_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
   i = 0;
   for (layout = 0; layout < num_layouts; layout++)
     {
-      gint num_levels, level;
+      int num_levels, level;
       num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, hardware_keycode, layout);
       for (level = 0; level < num_levels; level++)
         {
@@ -306,10 +306,10 @@ static gboolean
 gdk_wayland_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                             guint            hardware_keycode,
                                             GdkModifierType  state,
-                                            gint             group,
+                                            int              group,
                                             guint           *keyval,
-                                            gint            *effective_group,
-                                            gint            *effective_level,
+                                            int             *effective_group,
+                                            int             *effective_level,
                                             GdkModifierType *consumed_modifiers)
 {
   struct xkb_keymap *xkb_keymap;
@@ -390,9 +390,9 @@ _gdk_wayland_keymap_init (GdkWaylandKeymap *keymap)
 static void
 update_direction (GdkWaylandKeymap *keymap)
 {
-  gint num_layouts;
-  gint i;
-  gint *rtl;
+  int num_layouts;
+  int i;
+  int *rtl;
   xkb_keycode_t min_keycode, max_keycode;
   guint key;
   gboolean have_rtl, have_ltr;
@@ -400,7 +400,7 @@ update_direction (GdkWaylandKeymap *keymap)
   num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap);
 
   keymap->direction = g_renew (PangoDirection, keymap->direction, num_layouts);
-  rtl = g_newa (gint, num_layouts);
+  rtl = g_newa (int, num_layouts);
   for (i = 0; i < num_layouts; i++)
     rtl[i] = 0;
 
@@ -408,15 +408,15 @@ update_direction (GdkWaylandKeymap *keymap)
   max_keycode = xkb_keymap_max_keycode (keymap->xkb_keymap);
   for (key = min_keycode; key < max_keycode; key++)
     {
-       gint layouts, layout;
+       int layouts, layout;
 
        layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key);
        g_assert (layouts <= num_layouts);
        for (layout = 0; layout < layouts; layout++)
          {
            const xkb_keysym_t *syms;
-           gint num_syms;
-           gint sym;
+           int num_syms;
+           int sym;
 
            num_syms = xkb_keymap_key_get_syms_by_level (keymap->xkb_keymap, key, layout, 0, &syms);
            for (sym = 0; sym < num_syms; sym++)
index 46fec90c8e013dcf71a74be9eb1c56c6fe659be4..65eb7f387d264645390c5f8e238032309e64427a 100644 (file)
@@ -288,10 +288,10 @@ static void gdk_wayland_surface_sync_opaque_region (GdkSurface *surface);
 static void unset_transient_for_exported (GdkSurface *surface);
 
 static void gdk_wayland_surface_move_resize (GdkSurface *surface,
-                                             gint        x,
-                                             gint        y,
-                                             gint        width,
-                                             gint        height);
+                                             int         x,
+                                             int         y,
+                                             int         width,
+                                             int         height);
 
 static void update_popup_layout_state (GdkSurface     *surface,
                                        int             x,
@@ -2135,8 +2135,8 @@ update_popup_layout_state (GdkSurface     *surface,
                            int             height,
                            GdkPopupLayout *layout)
 {
-  gint surface_x, surface_y;
-  gint surface_width, surface_height;
+  int surface_x, surface_y;
+  int surface_width, surface_height;
   GdkRectangle best_rect;
   GdkRectangle flipped_rect;
   GdkGravity rect_anchor;
@@ -2239,8 +2239,8 @@ create_dynamic_positioner (GdkSurface     *surface,
   GdkRectangle geometry;
   uint32_t constraint_adjustment = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE;
   const GdkRectangle *anchor_rect;
-  gint real_anchor_rect_x, real_anchor_rect_y;
-  gint anchor_rect_width, anchor_rect_height;
+  int real_anchor_rect_x, real_anchor_rect_y;
+  int anchor_rect_width, anchor_rect_height;
   int rect_anchor_dx;
   int rect_anchor_dy;
   GdkGravity rect_anchor;
@@ -2761,10 +2761,10 @@ gdk_wayland_surface_hide (GdkSurface *surface)
 
 static void
 gdk_wayland_surface_move_resize (GdkSurface *surface,
-                                 gint        x,
-                                 gint        y,
-                                 gint        width,
-                                 gint        height)
+                                 int         x,
+                                 int         y,
+                                 int         width,
+                                 int         height)
 {
   GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
 
@@ -3048,10 +3048,10 @@ gdk_wayland_surface_present_popup (GdkSurface     *surface,
 
 static void
 gdk_wayland_surface_get_geometry (GdkSurface *surface,
-                                  gint       *x,
-                                  gint       *y,
-                                  gint       *width,
-                                  gint       *height)
+                                  int        *x,
+                                  int        *y,
+                                  int        *width,
+                                  int        *height)
 {
   if (!GDK_SURFACE_DESTROYED (surface))
     {
@@ -3068,10 +3068,10 @@ gdk_wayland_surface_get_geometry (GdkSurface *surface,
 
 static void
 gdk_wayland_surface_get_root_coords (GdkSurface *surface,
-                                     gint        x,
-                                     gint        y,
-                                     gint       *root_x,
-                                     gint       *root_y)
+                                     int         x,
+                                     int         y,
+                                     int        *root_x,
+                                     int        *root_y)
 {
   /*
    * Wayland does not have a global coordinate space shared between surfaces. In
@@ -3826,7 +3826,7 @@ gdk_wayland_surface_destroy_notify (GdkSurface *surface)
   g_object_unref (surface);
 }
 
-static gint
+static int
 gdk_wayland_surface_get_scale_factor (GdkSurface *surface)
 {
   GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
@@ -3859,7 +3859,7 @@ gdk_wayland_surface_set_shadow_width (GdkSurface *surface,
                                       int         bottom)
 {
   GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
-  gint new_width, new_height;
+  int new_width, new_height;
 
   if (GDK_SURFACE_DESTROYED (surface))
     return;
index e07fe84915ac43c2545e0db5b19c9cbde54d81bb..373a2a8e46ce3ca3fe6ce6680f388c7573f02931 100644 (file)
@@ -52,7 +52,7 @@ struct wl_compositor   *gdk_wayland_display_get_wl_compositor   (GdkDisplay *dis
 GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
                                                                  const gchar *theme,
-                                                                 gint         size);
+                                                                 int          size);
 GDK_AVAILABLE_IN_ALL
 const gchar *           gdk_wayland_display_get_startup_notification_id (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
index 606cd19eb3e4eb743803c317e6a427839c167ece..7c091a1626e4d9b3fe3b3be8de1cc7e105a96751 100644 (file)
 
 typedef struct {
        gchar   *name;
-       gint    id;
+       int     id;
        gchar   *bitmap;
-       gint    hotx;
-       gint    hoty;
+       int     hotx;
+       int     hoty;
 } font_info_t;
 
 typedef struct {
        gchar   *name;
-       gint    id;
-       gint    width;
-       gint    height;
-       gint    hotx;
-       gint    hoty;
+       int     id;
+       int     width;
+       int     height;
+       int     hotx;
+       int     hoty;
        gchar   *data;
 } cursor_info_t;
 
 static GSList *fonts = NULL;
 static GSList *cursors = NULL;
 
-static gint dw,dh;
+static int dw,dh;
 
 static gboolean debug = FALSE;
 
@@ -97,17 +97,17 @@ cursor_info_t *ci;
        }
 }
 
-static gint read_bdf_font(fname)
+static int read_bdf_font(fname)
 gchar *fname;
 {
        FILE *f;
        gchar line[2048];
-       gint rv = 0;
+       int rv = 0;
        gboolean startchar = FALSE, startbitmap = FALSE;
        gchar *charname,*p,*bitmap;
-       gint dx = 0,dy = 0;
-       gint w,h,x,y,py;
-       gint id,tmp;
+       int dx = 0,dy = 0;
+       int w,h,x,y,py;
+       int id,tmp;
 
        dw = 0;
        dh = 0;
@@ -210,7 +210,7 @@ gchar *fname;
        return rv;
 }
 
-static gint font_info_compare(fi, name)
+static int font_info_compare(fi, name)
 font_info_t *fi;
 char *name;
 {
@@ -303,8 +303,8 @@ int id;
 {
        static gchar cdata[8192];
        gchar *p;
-       gint i;
-       gint c;
+       int i;
+       int c;
        gboolean flushed;
 
        sprintf(cdata, "  { \"%s\", %d, %d, %d, %d, %d, \n    \"",
@@ -351,7 +351,7 @@ static int dump_cursors()
        GSList *ptr;
        FILE *f = stdout;
 
-       fprintf(f, "static const struct { const gchar *name; gint type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n");
+       fprintf(f, "static const struct { const gchar *name; int type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n");
 
        for (ptr = cursors; ptr; ptr = ptr->next)
        {
@@ -365,8 +365,8 @@ static int dump_cursors()
        return 0;
 }
 
-gint main(argc, argv)
-gint argc;
+int main(argc, argv)
+int argc;
 gchar **argv;
 {
        if (argc != 2)
index 5ccc64077422b14d6f0e11f8b7511c1e13f4e90e..41b54deb3dfe4affa0f1cc59ccc141f0cd0591b2 100644 (file)
@@ -33,7 +33,7 @@ G_DEFINE_TYPE (GdkWin32CairoContext, gdk_win32_cairo_context, GDK_TYPE_CAIRO_CON
 
 void
 gdk_win32_surface_get_queued_window_rect (GdkSurface *surface,
-                                          gint        scale,
+                                          int         scale,
                                           RECT       *return_window_rect)
 {
   RECT window_rect;
@@ -79,9 +79,9 @@ gdk_win32_surface_apply_queued_move_resize (GdkSurface *surface,
 
 static cairo_surface_t *
 create_cairo_surface_for_layered_window (GdkWin32Surface  *impl,
-                                         gint                  width,
-                                         gint                  height,
-                                         gint                  scale)
+                                         int                   width,
+                                         int                   height,
+                                         int                   scale)
 {
   if (width > impl->dib_width ||
       height > impl->dib_height)
@@ -146,7 +146,7 @@ gdk_win32_cairo_context_begin_frame (GdkDrawContext *draw_context,
   GdkWin32Surface *impl;
   int scale;
   cairo_t *cr;
-  gint width, height;
+  int width, height;
   RECT queued_window_rect;
 
   surface = gdk_draw_context_get_surface (draw_context);
@@ -236,7 +236,7 @@ gdk_win32_cairo_context_end_frame (GdkDrawContext *draw_context,
 {
   GdkWin32CairoContext *self = GDK_WIN32_CAIRO_CONTEXT (draw_context);
   GdkSurface *surface;
-  gint scale;
+  int scale;
 
   surface = gdk_draw_context_get_surface (draw_context);
   scale = gdk_surface_get_scale_factor (surface);
index 69b5522ffec9e45a4abdc08914aadf7e497ed7f0..99fbfd76f9ff3dd2936988e408ea399a9ebdde89 100644 (file)
@@ -53,8 +53,8 @@ struct _GdkWin32CairoContext
    * around between repaints, and only re-allocate it
    * if it's too small. */
   cairo_surface_t *db_surface;
-  gint             db_width;
-  gint             db_height;
+  int              db_width;
+  int              db_height;
 
   /* Surface for the window DC (in non-layered mode).
    * A reference of the cache surface (in layered mode). */
index 0755876d653dc42e139b14e8db6d03002c523d71..65e4fdb0d9f0318cb6092a93db9d6503e9d9bc90 100644 (file)
@@ -630,7 +630,7 @@ free_queue_item (GdkWin32ClipboardThreadQueueItem *item)
   GdkWin32ClipboardThreadAdvertise *adv;
   GdkWin32ClipboardThreadRetrieve *retr;
   GdkWin32ClipboardThreadStore    *store;
-  gint i;
+  int i;
 
   switch (item->item_type)
     {
@@ -706,7 +706,7 @@ static gboolean
 process_advertise (GdkWin32ClipboardThreadAdvertise *adv)
 {
   DWORD error_code;
-  gint i;
+  int i;
 
   if (g_get_monotonic_time () > adv->parent.end_time)
     {
@@ -785,7 +785,7 @@ static gboolean
 process_store (GdkWin32ClipboardThreadStore *store)
 {
   DWORD error_code;
-  gint i;
+  int i;
 
   if (g_get_monotonic_time () > store->parent.end_time)
     {
@@ -911,7 +911,7 @@ static gboolean
 process_retrieve (GdkWin32ClipboardThreadRetrieve *retr)
 {
   DWORD error_code;
-  gint i;
+  int i;
   UINT fmt, fmt_to_use;
   HANDLE hdata;
   GdkWin32ContentFormatPair *pair;
@@ -1290,7 +1290,7 @@ inner_clipboard_window_procedure (HWND   hwnd,
 
         if (API_CALL (OpenClipboard, (hwnd)))
           {
-            gint i;
+            int i;
             GdkWin32ContentFormatPair *pair;
 
             for (pair = NULL, i = 0;
@@ -1310,7 +1310,7 @@ inner_clipboard_window_procedure (HWND   hwnd,
       }
     case WM_RENDERFORMAT:
       {
-        gint i;
+        int i;
         GdkWin32ClipboardThreadRender *render;
         GdkWin32ClipboardThreadRender *returned_render;
         GdkWin32ContentFormatPair *pair;
@@ -1880,7 +1880,7 @@ gchar *
 _gdk_win32_get_clipboard_format_name (UINT      fmt,
                                       gboolean *is_predefined)
 {
-  gint registered_name_w_len = 1024;
+  int registered_name_w_len = 1024;
   wchar_t *registered_name_w = g_malloc (registered_name_w_len);
   gchar *registered_name = NULL;
   int gcfn_result;
@@ -1959,7 +1959,7 @@ static GArray *
 get_compatibility_w32formats_for_contentformat (const gchar *contentformat)
 {
   GArray *result = NULL;
-  gint i;
+  int i;
   GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get ();
 
   result = g_hash_table_lookup (clipdrop->compatibility_w32formats, contentformat);
@@ -2021,7 +2021,7 @@ _gdk_win32_add_w32format_to_pairs (UINT                      w32format,
   const gchar *interned_w32format_name;
   GdkWin32ContentFormatPair pair;
   GArray *comp_pairs;
-  gint i, j;
+  int i, j;
 
   if (w32format_name != NULL)
     {
@@ -2073,7 +2073,7 @@ _gdk_win32_add_w32format_to_pairs (UINT                      w32format,
 
 static void
 transmute_cf_unicodetext_to_utf8_string (const guchar    *data,
-                                         gint             length,
+                                         int              length,
                                          guchar         **set_data,
                                          gsize           *set_data_length,
                                          GDestroyNotify  *set_data_destroy)
@@ -2113,7 +2113,7 @@ transmute_cf_unicodetext_to_utf8_string (const guchar    *data,
 
 static void
 transmute_utf8_string_to_cf_unicodetext (const guchar    *data,
-                                         gint             length,
+                                         int              length,
                                          guchar         **set_data,
                                          gsize           *set_data_length,
                                          GDestroyNotify  *set_data_destroy)
@@ -2121,7 +2121,7 @@ transmute_utf8_string_to_cf_unicodetext (const guchar    *data,
   glong wclen;
   GError *err = NULL;
   glong size;
-  gint i;
+  int i;
   wchar_t *wcptr, *p;
 
   wcptr = g_utf8_to_utf16 ((char *) data, length, NULL, &wclen, &err);
@@ -2188,7 +2188,7 @@ wchar_to_str (const wchar_t  *wstr,
 
 static void
 transmute_utf8_string_to_cf_text (const guchar    *data,
-                                  gint             length,
+                                  int              length,
                                   guchar         **set_data,
                                   gsize           *set_data_length,
                                   GDestroyNotify  *set_data_destroy)
@@ -2196,7 +2196,7 @@ transmute_utf8_string_to_cf_text (const guchar    *data,
   glong rlen;
   GError *err = NULL;
   gsize size;
-  gint i;
+  int i;
   char *strptr, *p;
   wchar_t *wcptr;
 
@@ -2274,7 +2274,7 @@ str_to_wchar (const char  *str,
 
 static void
 transmute_cf_text_to_utf8_string (const guchar    *data,
-                                  gint             length,
+                                  int              length,
                                   guchar         **set_data,
                                   gsize           *set_data_length,
                                   GDestroyNotify  *set_data_destroy)
@@ -2320,7 +2320,7 @@ transmute_cf_text_to_utf8_string (const guchar    *data,
 
 static void
 transmute_cf_dib_to_image_bmp (const guchar    *data,
-                               gint             length,
+                               int              length,
                                guchar         **set_data,
                                gsize           *set_data_length,
                                GDestroyNotify  *set_data_destroy)
@@ -2354,8 +2354,8 @@ transmute_cf_dib_to_image_bmp (const guchar    *data,
   BITMAPINFOHEADER *bi = (BITMAPINFOHEADER *) data;
   BITMAPFILEHEADER *bf;
   gpointer result;
-  gint data_length = length;
-  gint new_length;
+  int data_length = length;
+  int new_length;
   gboolean make_dibv5 = FALSE;
   BITMAPV5HEADER *bV5;
   guchar *p;
@@ -2490,7 +2490,7 @@ transmute_cf_dib_to_image_bmp (const guchar    *data,
 
 static void
 transmute_cf_shell_id_list_to_text_uri_list (const guchar    *data,
-                                             gint             length,
+                                             int              length,
                                              guchar         **set_data,
                                              gsize           *set_data_length,
                                              GDestroyNotify  *set_data_destroy)
@@ -2540,12 +2540,12 @@ transmute_cf_shell_id_list_to_text_uri_list (const guchar    *data,
 
 void
 transmute_image_bmp_to_cf_dib (const guchar    *data,
-                               gint             length,
+                               int              length,
                                guchar         **set_data,
                                gsize           *set_data_length,
                                GDestroyNotify  *set_data_destroy)
 {
-  gint size;
+  int size;
   guchar *ptr;
 
   g_return_if_fail (length >= sizeof (BITMAPFILEHEADER));
@@ -2630,7 +2630,7 @@ gboolean
 _gdk_win32_transmute_contentformat (const gchar   *from_contentformat,
                                     UINT           to_w32format,
                                     const guchar  *data,
-                                    gint           length,
+                                    int            length,
                                     guchar       **set_data,
                                     gsize         *set_data_length)
 {
@@ -2682,16 +2682,16 @@ _gdk_win32_transmute_contentformat (const gchar   *from_contentformat,
   return TRUE;
 }
 
-gint
+int
 _gdk_win32_add_contentformat_to_pairs (const char *contentformat,
                                        GArray     *array)
 {
-  gint added_count = 0;
+  int added_count = 0;
   wchar_t *contentformat_w;
   GdkWin32ContentFormatPair fmt;
-  gint i;
+  int i;
   GArray *comp_pairs;
-  gint starting_point;
+  int starting_point;
   const wchar_t *prefix = L"application/x.windows.";
   size_t prefix_len = wcslen (prefix);
   size_t offset = 0;
@@ -2732,7 +2732,7 @@ _gdk_win32_add_contentformat_to_pairs (const char *contentformat,
   comp_pairs = get_compatibility_w32formats_for_contentformat (contentformat);
   for (i = 0; comp_pairs != NULL && i < comp_pairs->len; i++)
     {
-      gint j;
+      int j;
 
       fmt = g_array_index (comp_pairs, GdkWin32ContentFormatPair, i);
 
@@ -2834,7 +2834,7 @@ clipboard_store_hdata_ready (GObject      *clipboard,
                              gpointer      user_data)
 {
   GError *error = NULL;
-  gint i;
+  int i;
   gboolean no_other_streams;
   GdkWin32ClipboardHDataPrepAndStream *prep_and_stream = (GdkWin32ClipboardHDataPrepAndStream *) user_data;
   GdkWin32ClipboardStorePrep *prep = prep_and_stream->prep;
index 418d52c36ee72c71cc2d14d7b660cdeb814b7e12..f28b0eec806e5f7d6d529df82eb54baf6b0d8287 100644 (file)
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
  * Also remembers whether the data needs to be transmuted.
  */
 typedef struct {
-  gint w32format;
+  int w32format;
   /* This is assumed to be an interned string, it will be
    * compared by simply comparing the pointer.
    */
@@ -208,7 +208,7 @@ struct _GdkWin32Clipdrop
    * anything in the queue. If there is, then the queue
    * processing (which requires expensice locks) can happen.
    */
-  gint              dnd_queue_counter;
+  int               dnd_queue_counter;
 
   /* We don't actually support multiple simultaneous drags,
    * for obvious reasons (though this might change with
@@ -243,7 +243,7 @@ gchar  * _gdk_win32_get_clipboard_format_name                      (UINT
 void     _gdk_win32_add_w32format_to_pairs                         (UINT                         format,
                                                                     GArray                      *array,
                                                                     GdkContentFormatsBuilder    *builder);
-gint     _gdk_win32_add_contentformat_to_pairs                     (const char                  *target,
+int      _gdk_win32_add_contentformat_to_pairs                     (const char                  *target,
                                                                     GArray                      *array);
 
 void     _gdk_win32_clipboard_default_output_done                  (GObject                     *clipboard,
@@ -252,7 +252,7 @@ void     _gdk_win32_clipboard_default_output_done                  (GObject
 gboolean _gdk_win32_transmute_contentformat                        (const gchar                 *from_contentformat,
                                                                     UINT                         to_w32format,
                                                                     const guchar                *data,
-                                                                    gint                         length,
+                                                                    int                          length,
                                                                     guchar                     **set_data,
                                                                     gsize                       *set_data_length);
 
index b1545a67bab264c348ce424d4842d20b0f77a7a9..9184e6bcd35d02812b75edc22ae2b348a333d870 100644 (file)
@@ -381,12 +381,12 @@ gdk_win32_hcursor_get_handle (GdkWin32HCursor *cursor)
 }
 
 static HCURSOR
-hcursor_from_x_cursor (gint         i,
+hcursor_from_x_cursor (int          i,
                        const gchar *name)
 {
-  gint j, x, y, ofs;
+  int j, x, y, ofs;
   HCURSOR rv;
-  gint w, h;
+  int w, h;
   guchar *and_plane, *xor_plane;
 
   w = GetSystemMetrics (SM_CXCURSOR);
@@ -410,9 +410,9 @@ hcursor_from_x_cursor (gint         i,
 
          for (x = 0; x < cursors[i].width && x < w ; x++, j++)
            {
-             gint pofs = ofs + x / 8;
+             int pofs = ofs + x / 8;
              guchar data = (cursors[i].data[j/4] & (0xc0 >> (2 * (j%4)))) >> (2 * (3 - (j%4)));
-             gint bit = 7 - (j % cursors[i].width) % 8;
+             int bit = 7 - (j % cursors[i].width) % 8;
 
              if (data)
                {
@@ -510,10 +510,10 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display,
 static Win32Cursor *
 win32_cursor_new (GdkWin32CursorLoadType load_type,
                   gpointer               resource_name,
-                  gint                   width,
-                  gint                   height,
+                  int                    width,
+                  int                    height,
                   guint                  load_flags,
-                  gint                   xcursor_number)
+                  int                    xcursor_number)
 {
   Win32Cursor *result;
 
@@ -545,7 +545,7 @@ win32_cursor_destroy (gpointer data)
 
 static void
 win32_cursor_theme_load_from (Win32CursorTheme *theme,
-                              gint              size,
+                              int               size,
                               const gchar      *dir)
 {
   GDir *gdir;
@@ -600,11 +600,11 @@ win32_cursor_theme_load_from (Win32CursorTheme *theme,
 static void
 win32_cursor_theme_load_from_dirs (Win32CursorTheme *theme,
                                    const gchar      *name,
-                                   gint              size)
+                                   int               size)
 {
   gchar *theme_dir;
   const gchar * const *dirs;
-  gint i;
+  int i;
 
   dirs = g_get_system_data_dirs ();
 
@@ -624,9 +624,9 @@ win32_cursor_theme_load_from_dirs (Win32CursorTheme *theme,
 
 static void
 win32_cursor_theme_load_system (Win32CursorTheme *theme,
-                                gint              size)
+                                int               size)
 {
-  gint             i;
+  int              i;
   HCURSOR          shared_hcursor;
   HCURSOR          x_hcursor;
   Win32Cursor     *cursor;
@@ -690,7 +690,7 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme,
 
 Win32CursorTheme *
 win32_cursor_theme_load (const gchar *name,
-                         gint        size)
+                         int         size)
 {
   Win32CursorTheme *result = g_new0 (Win32CursorTheme, 1);
 
@@ -801,7 +801,7 @@ static GdkWin32HCursor *
 win32hcursor_x_from_name (GdkWin32Display *display,
                           const gchar     *name)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < G_N_ELEMENTS (cursors); i++)
     if (cursors[i].name == NULL || strcmp (cursors[i].name, name) == 0)
@@ -856,7 +856,7 @@ win32hcursor_from_name (GdkWin32Display *display,
 static GdkWin32HCursor *
 create_blank_win32hcursor (GdkWin32Display *display)
 {
-  gint w, h;
+  int w, h;
   guchar *and_plane, *xor_plane;
   HCURSOR rv;
 
@@ -901,8 +901,8 @@ gdk_win32hcursor_create_for_name (GdkWin32Display  *display,
 static HICON
 pixbuf_to_hicon (GdkPixbuf *pixbuf,
                  gboolean   is_icon,
-                 gint       x,
-                 gint       y);
+                 int        x,
+                 int        y);
 
 static GdkWin32HCursor *
 gdk_win32hcursor_create_for_texture (GdkWin32Display *display,
@@ -912,7 +912,7 @@ gdk_win32hcursor_create_for_texture (GdkWin32Display *display,
 {
   cairo_surface_t *surface;
   GdkPixbuf *pixbuf;
-  gint width, height;
+  int width, height;
   HICON icon;
 
   surface = gdk_texture_download_surface (texture);
@@ -1015,7 +1015,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
   } bmi;
   HDC hdc;
   guchar *pixels, *bits;
-  gint rowstride, x, y, w, h;
+  int rowstride, x, y, w, h;
 
   if (!GDI_CALL (GetIconInfo, (hicon, &ii)))
     return NULL;
@@ -1113,7 +1113,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
        {
          for (x = 0; x < w; x++)
            {
-             const gint bit = 7 - (x % 8);
+             const int bit = 7 - (x % 8);
              printf ("%c ", ((bits[bpl*y+x/8])&(1<<bit)) ? ' ' : 'X');
            }
          printf ("\n");
@@ -1135,7 +1135,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
            }
          for (x = 0; x < w; x++)
            {
-             const gint bit = 7 - (x % 8);
+             const int bit = 7 - (x % 8);
              if ((*andp) & (1<<bit))
                {
                  if ((*xorp) & (1<<bit))
@@ -1183,7 +1183,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
  */
 
 static HBITMAP
-create_alpha_bitmap (gint     size,
+create_alpha_bitmap (int      size,
                     guchar **outdata)
 {
   BITMAPV5HEADER bi;
@@ -1221,9 +1221,9 @@ create_alpha_bitmap (gint     size,
 }
 
 static HBITMAP
-create_color_bitmap (gint     size,
+create_color_bitmap (int      size,
                     guchar **outdata,
-                    gint     bits)
+                    int      bits)
 {
   struct {
     BITMAPV4HEADER bmiHeader;
@@ -1272,7 +1272,7 @@ pixbuf_to_hbitmaps_alpha_winxp (GdkPixbuf *pixbuf,
   HBITMAP hColorBitmap, hMaskBitmap;
   guchar *indata, *inrow;
   guchar *colordata, *colorrow, *maskdata, *maskbyte;
-  gint width, height, size, i, i_offset, j, j_offset, rowstride;
+  int width, height, size, i, i_offset, j, j_offset, rowstride;
   guint maskstride, mask_bit;
 
   width = gdk_pixbuf_get_width (pixbuf); /* width of icon */
@@ -1350,7 +1350,7 @@ pixbuf_to_hbitmaps_normal (GdkPixbuf *pixbuf,
   HBITMAP hColorBitmap, hMaskBitmap;
   guchar *indata, *inrow;
   guchar *colordata, *colorrow, *maskdata, *maskbyte;
-  gint width, height, size, i, i_offset, j, j_offset, rowstride, nc, bmstride;
+  int width, height, size, i, i_offset, j, j_offset, rowstride, nc, bmstride;
   gboolean has_alpha;
   guint maskstride, mask_bit;
 
@@ -1432,8 +1432,8 @@ pixbuf_to_hbitmaps_normal (GdkPixbuf *pixbuf,
 static HICON
 pixbuf_to_hicon (GdkPixbuf *pixbuf,
                 gboolean   is_icon,
-                gint       x,
-                gint       y)
+                int        x,
+                int        y)
 {
   ICONINFO ii;
   HICON icon;
@@ -1464,7 +1464,7 @@ _gdk_win32_texture_to_hicon (GdkTexture *texture)
 {
   cairo_surface_t *surface;
   GdkPixbuf *pixbuf;
-  gint width, height;
+  int width, height;
   HICON icon;
   
   surface = gdk_texture_download_surface (texture);
@@ -1482,8 +1482,8 @@ _gdk_win32_texture_to_hicon (GdkTexture *texture)
 
 HICON
 _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
-                             gint       x_hotspot,
-                             gint       y_hotspot)
+                             int        x_hotspot,
+                             int        y_hotspot)
 {
   return pixbuf_to_hicon (pixbuf, FALSE, x_hotspot, y_hotspot);
 }
index 129c5a056f0363e6d03113567ac0f19d96694708..0f836109523681317c6b2487ce334aec8bea97a2 100644 (file)
@@ -89,7 +89,7 @@ gdk_device_win32_query_state (GdkDevice        *device,
 {
   POINT point;
   HWND hwnd, hwndc;
-  gint scale;
+  int scale;
 
   if (window)
     {
index 052c71bee6576c1614bbdf45ec89fcf80e211a7b..124fcef2e7ab2b75a8a1fb4031d15003abbac36c 100644 (file)
@@ -193,9 +193,9 @@ _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab,
 {
   GdkDevice *device;
   GdkSurface *impl_surface;
-  gint root_x, root_y;
+  int root_x, root_y;
   gdouble temp_x, temp_y;
-  gint i;
+  int i;
 
   device = GDK_DEVICE (device_wintab);
   impl_surface = window;
index f706dd91df1ef05f289fb28b7d2ece9ae9fbd005..2679d73b806dc51a7b7feefcc094d4e5ca5e1ea8 100644 (file)
@@ -40,8 +40,8 @@ struct _GdkDeviceWintab
   GdkDevice parent_instance;
 
   gboolean sends_core;
-  gint *last_axis_data;
-  gint button_state;
+  int *last_axis_data;
+  int button_state;
 
   /* WINTAB stuff: */
   HCTX hctx;
index b3f9e75b832d4d8531d31ec9c7a570a2152a5534..a2d26b023191435a6cbaaef9d810a5cf6bce7122 100644 (file)
@@ -44,7 +44,7 @@
 
 static GList     *wintab_contexts = NULL;
 static GdkSurface *wintab_window = NULL;
-extern gint       _gdk_input_ignore_core;
+extern int        _gdk_input_ignore_core;
 
 typedef UINT (WINAPI *t_WTInfoA) (UINT a, UINT b, LPVOID c);
 typedef UINT (WINAPI *t_WTInfoW) (UINT a, UINT b, LPVOID c);
@@ -627,7 +627,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager)
               num_axes += 2;
             }
 
-          device->last_axis_data = g_new (gint, num_axes);
+          device->last_axis_data = g_new (int, num_axes);
 
           GDK_NOTE (INPUT, g_print ("device: (%u) %s axes: %d\n",
                                     cursorix,
@@ -778,7 +778,7 @@ _gdk_input_set_tablet_active (void)
 }
 
 static void
-decode_tilt (gint   *axis_data,
+decode_tilt (int    *axis_data,
              AXIS   *axes,
              PACKET *packet)
 {
@@ -878,7 +878,7 @@ gdk_input_other_event (GdkDisplay *display,
   GdkEvent *event;
 
   PACKET packet;
-  gint num_axes;
+  int num_axes;
   double x, y;
   guint translated_buttons, button_diff, button_mask;
 
index f1382b4df80a2f7553ba87d437f4771310036868..003be32a446435bca82e421b362dfd6943c3da24 100644 (file)
@@ -46,7 +46,7 @@ struct _GdkDeviceManagerWin32
    * of our context (WT_PROXIMITY). Bumped down when we either
    * receive a WT_PACKET, or a WT_CSRCHANGE.
    */
-  gint dev_entered_proximity;
+  int dev_entered_proximity;
 };
 
 struct _GdkDeviceManagerWin32Class
index 11fc4aecd75d044879fd7f449a22f400b85e45c0..53227c70ffa9ff87605cca9bd05c058333369806 100644 (file)
@@ -187,7 +187,7 @@ void
 _gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
 {
   GPtrArray *new_monitors;
-  gint i;
+  int i;
   GdkWin32Monitor *primary_to_move = NULL;
 
   for (i = 0; i < g_list_model_get_n_items (win32_display->monitors); i++)
@@ -340,10 +340,10 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
 void
 gdk_win32_display_set_cursor_theme (GdkDisplay  *display,
                                     const gchar *name,
-                                    gint         size)
+                                    int          size)
 {
-  gint cursor_size;
-  gint w, h;
+  int cursor_size;
+  int w, h;
   Win32CursorTheme *theme;
   GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display);
 
@@ -957,7 +957,7 @@ guint
 _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
                                              HMONITOR         hmonitor,
                                              HWND             hwnd,
-                                             gint            *dpi)
+                                             int             *dpi)
 {
   gboolean is_scale_acquired = FALSE;
   gboolean use_dpi_for_monitor = FALSE;
index 8fb5ec4cb586ba6415cf34a177253c7fc8856031..02c217189fd330e5f22bbc2431df37c6651f1aa0 100644 (file)
@@ -129,7 +129,7 @@ void        gdk_win32_display_check_composited (GdkWin32Display *display);
 guint      _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
                                                         HMONITOR         hmonitor,
                                                         HWND             hwnd,
-                                                        gint             *dpi);
+                                                        int              *dpi);
 
 typedef struct _GdkWin32MessageFilter GdkWin32MessageFilter;
 
index 04169bedeb3dc1858cd78bcc72304a3f8d811267..20f8cb3f4b72af781ddd5777c3d3b78de28ae3c7 100644 (file)
@@ -225,7 +225,7 @@ typedef struct
 {
   IDropSource                     ids;
   IDropSourceNotify               idsn;
-  gint                            ref_count;
+  int                             ref_count;
   GdkDrag                        *drag;
 
   /* These are thread-local
@@ -1207,7 +1207,7 @@ query (LPDATAOBJECT                This,
        GdkWin32ContentFormatPair **pair)
 {
   data_object *ctx = (data_object *) This;
-  gint i;
+  int i;
 
   if (pair)
     *pair = NULL;
@@ -1633,8 +1633,8 @@ data_object_new (GdkDrag *drag)
 
   for (i = 0; i < n_mime_types; i++)
     {
-      gint added_count = 0;
-      gint j;
+      int added_count = 0;
+      int j;
 
       GDK_NOTE (DND, g_print ("DataObject supports contentformat 0x%p (%s)\n", mime_types[i], mime_types[i]));
 
@@ -1790,8 +1790,8 @@ _gdk_win32_surface_drag_begin (GdkSurface         *surface,
  * Unless, of course, we keep the LOCAL protocol around.
  */
 typedef struct {
-  gint x;
-  gint y;
+  int x;
+  int y;
   HWND ignore;
   HWND result;
 } find_window_enum_arg;
@@ -1834,8 +1834,8 @@ find_window_enum_proc (HWND   hwnd,
 static HWND
 gdk_win32_drag_find_window (GdkDrag    *drag,
                             GdkSurface *drag_surface,
-                            gint        x_root,
-                            gint        y_root)
+                            int         x_root,
+                            int         y_root)
 {
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
   find_window_enum_arg a;
@@ -1903,8 +1903,8 @@ _gdk_win32_get_drop_for_dest_window (HWND dest_window)
 static gboolean
 gdk_win32_local_drag_motion (GdkDrag         *drag,
                              HWND             dest_window,
-                             gint             x_root,
-                             gint             y_root,
+                             int              x_root,
+                             int              y_root,
                              GdkDragAction    possible_actions,
                              DWORD            key_state,
                              guint32          time_)
@@ -2087,7 +2087,7 @@ gdk_drag_anim_timeout (gpointer data)
   gint64 current_time;
   double f;
   double t;
-  gint x, y;
+  int x, y;
 
   if (!frame_clock)
     return G_SOURCE_REMOVE;
@@ -2381,7 +2381,7 @@ gdk_dnd_handle_key_event (GdkDrag  *drag,
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
   GdkModifierType state;
   GdkDevice *pointer;
-  gint dx, dy;
+  int dx, dy;
 
   GDK_NOTE (DND, g_print ("gdk_dnd_handle_key_event: 0x%p\n", drag));
 
@@ -2546,8 +2546,8 @@ gdk_win32_drag_get_drag_surface (GdkDrag *drag)
 
 static void
 gdk_win32_drag_set_hotspot (GdkDrag *drag,
-                            gint     hot_x,
-                            gint     hot_y)
+                            int      hot_x,
+                            int      hot_y)
 {
   GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag);
 
index 8d4af3b42099912f3462035a68390696b578ffe2..8d0ba3943129bdc0ce26c11883f52adee948511b 100644 (file)
@@ -83,8 +83,8 @@ struct _GdkWin32Drop
   GdkDragAction    actions;
 
   guint            scale;          /* Temporarily caches the HiDPI scale */
-  gint             last_x;         /* Coordinates from last event, in GDK space */
-  gint             last_y;
+  int              last_x;         /* Coordinates from last event, in GDK space */
+  int              last_y;
   DWORD            last_key_state; /* Key state from last event */
 
   /* Just like GdkDrop->formats, but an array, and with format IDs
@@ -117,7 +117,7 @@ G_DEFINE_TYPE (GdkWin32Drop, gdk_win32_drop, GDK_TYPE_DROP)
 struct _drop_target_context
 {
   IDropTarget                     idt;
-  gint                            ref_count;
+  int                             ref_count;
 
   /* The drop object we create when a drag enters our surface.
    * The drop object is destroyed when the drag leaves.
@@ -454,8 +454,8 @@ set_source_actions_helper (GdkDrop       *drop,
 void
 _gdk_win32_local_drop_target_dragenter (GdkDrag        *drag,
                                         GdkSurface     *dest_surface,
-                                        gint            x_root,
-                                        gint            y_root,
+                                        int             x_root,
+                                        int             y_root,
                                         DWORD           grfKeyState,
                                         guint32         time_,
                                         GdkDragAction  *actions)
@@ -514,8 +514,8 @@ idroptarget_dragenter (LPDROPTARGET This,
   GdkDrop *drop;
   GdkWin32Drop *drop_win32;
   GdkDisplay *display;
-  gint pt_x;
-  gint pt_y;
+  int pt_x;
+  int pt_y;
   GdkDrag *drag;
   GdkDragAction source_actions;
   GdkDragAction dest_actions;
@@ -574,8 +574,8 @@ idroptarget_dragenter (LPDROPTARGET This,
 
 gboolean
 _gdk_win32_local_drop_target_will_emit_motion (GdkDrop *drop,
-                                               gint     x_root,
-                                               gint     y_root,
+                                               int      x_root,
+                                               int      y_root,
                                                DWORD    grfKeyState)
 {
   GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop);
@@ -591,8 +591,8 @@ _gdk_win32_local_drop_target_will_emit_motion (GdkDrop *drop,
 void
 _gdk_win32_local_drop_target_dragover (GdkDrop        *drop,
                                        GdkDrag        *drag,
-                                       gint            x_root,
-                                       gint            y_root,
+                                       int             x_root,
+                                       int             y_root,
                                        DWORD           grfKeyState,
                                        guint32         time_,
                                        GdkDragAction  *actions)
@@ -639,8 +639,8 @@ idroptarget_dragover (LPDROPTARGET This,
 {
   drop_target_context *ctx = (drop_target_context *) This;
   GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop);
-  gint pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
-  gint pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
+  int pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
+  int pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
   GdkDragAction source_actions;
   GdkDragAction dest_actions;
 
@@ -743,8 +743,8 @@ idroptarget_drop (LPDROPTARGET This,
 {
   drop_target_context *ctx = (drop_target_context *) This;
   GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop);
-  gint pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
-  gint pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
+  int pt_x = pt.x / drop_win32->scale + _gdk_offset_x;
+  int pt_y = pt.y / drop_win32->scale + _gdk_offset_y;
   GdkDragAction dest_action;
 
   GDK_NOTE (DND, g_print ("idroptarget_drop %p ", This));
@@ -930,7 +930,7 @@ close_it (gpointer data)
 static GdkWin32MessageFilterReturn
 gdk_dropfiles_filter (GdkWin32Display *display,
                       MSG             *msg,
-                      gint            *ret_valp,
+                      int             *ret_valp,
                       gpointer         data)
 {
   GdkSurface *window;
@@ -939,7 +939,7 @@ gdk_dropfiles_filter (GdkWin32Display *display,
   GString *result;
   HANDLE hdrop;
   POINT pt;
-  gint nfiles, i;
+  int nfiles, i;
   gchar *fileName, *linkedFile;
 
   if (msg->message != WM_DROPFILES)
index 377f4afbdfb2021109e18c0136ad7a9abb280efb..0802fabdd3000e5205ddb37429373a46f0ed96d9 100644 (file)
 #define SYNAPSIS_ICON_WINDOW_CLASS "SynTrackCursorWindowClass"
 
 static gboolean gdk_event_translate (MSG        *msg,
-                                    gint       *ret_valp);
+                                    int        *ret_valp);
 static gboolean gdk_event_prepare  (GSource     *source,
-                                   gint        *timeout);
+                                   int         *timeout);
 static gboolean gdk_event_check    (GSource     *source);
 static gboolean gdk_event_dispatch (GSource     *source,
                                    GSourceFunc  callback,
@@ -111,7 +111,7 @@ static gboolean gdk_event_dispatch (GSource     *source,
 /* Private variable declarations
  */
 
-extern gint       _gdk_input_ignore_core;
+extern int        _gdk_input_ignore_core;
 
 typedef struct
 {
@@ -139,8 +139,8 @@ static GdkSurface *implicit_grab_surface = NULL;
 
 static GdkSurface *mouse_window = NULL;
 static GdkSurface *mouse_window_ignored_leave = NULL;
-static gint current_x, current_y;
-static gint current_root_x, current_root_y;
+static int current_x, current_y;
+static int current_root_x, current_root_y;
 
 static UINT got_gdk_events_message;
 static HWND modal_win32_dialog = NULL;
@@ -250,7 +250,7 @@ inner_window_procedure (HWND   hwnd,
 {
   MSG msg;
   DWORD pos;
-  gint ret_val = 0;
+  int ret_val = 0;
 
   msg.hwnd = hwnd;
   msg.message = message;
@@ -687,10 +687,10 @@ get_active_group (void)
   return _gdk_win32_keymap_get_active_group (keymap);
 }
 
-static gint
+static int
 build_pointer_event_state (MSG *msg)
 {
-  gint state;
+  int state;
 
   state = 0;
 
@@ -912,7 +912,7 @@ _gdk_win32_append_event (GdkEvent *event)
 static GdkWin32MessageFilterReturn
 apply_message_filters (GdkDisplay *display,
                        MSG        *msg,
-                       gint       *ret_valp,
+                       int        *ret_valp,
                        GList     **filters)
 {
   GdkWin32MessageFilterReturn result = GDK_WIN32_MESSAGE_FILTER_CONTINUE;
@@ -1324,7 +1324,7 @@ _gdk_win32_hrgn_to_region (HRGN  hrgn,
   RGNDATA *rgndata;
   RECT *rects;
   cairo_region_t *result;
-  gint nbytes;
+  int nbytes;
   guint i;
 
   if ((nbytes = GetRegionData (hrgn, 0, NULL)) == 0)
@@ -1364,7 +1364,7 @@ _gdk_win32_hrgn_to_region (HRGN  hrgn,
 static void
 adjust_drag (LONG *drag,
             LONG  curr,
-            gint  inc)
+            int   inc)
 {
   if (*drag > curr)
     *drag = curr + ((*drag + inc/2 - curr) / inc) * inc;
@@ -1482,7 +1482,7 @@ handle_nchittest (HWND hwnd,
                   GdkSurface *window,
                   gint16 screen_x,
                   gint16 screen_y,
-                  gint *ret_valp)
+                  int *ret_valp)
 {
   RECT rect;
   GdkWin32Surface *impl;
@@ -1569,7 +1569,7 @@ handle_dpi_changed (GdkSurface *window,
 
 static void
 generate_button_event (GdkEventType      type,
-                       gint              button,
+                       int               button,
                        GdkSurface        *window,
                        MSG              *msg)
 {
@@ -1820,7 +1820,7 @@ ensure_stacking_on_activate_app (MSG       *msg,
 }
 
 static gboolean
-handle_wm_sysmenu (GdkSurface *window, MSG *msg, gint *ret_valp)
+handle_wm_sysmenu (GdkSurface *window, MSG *msg, int *ret_valp)
 {
   GdkWin32Surface *impl;
   LONG_PTR style, tmp_style;
@@ -2006,8 +2006,8 @@ _gdk_win32_surface_fill_min_max_info (GdkSurface  *window,
                             GDK_BUTTON5_MASK)
 
 static gboolean
-gdk_event_translate (MSG  *msg,
-                    gint *ret_valp)
+gdk_event_translate (MSG *msg,
+                    int *ret_valp)
 {
   RECT rect, *drag, orig_drag;
   POINT point;
@@ -2021,7 +2021,7 @@ gdk_event_translate (MSG  *msg,
   GdkEvent *event;
 
   wchar_t wbuf[100];
-  gint ccount;
+  int ccount;
 
   GdkDisplay *display;
   GdkSurface *window = NULL;
@@ -2036,7 +2036,7 @@ gdk_event_translate (MSG  *msg,
   GdkDeviceGrabInfo *pointer_grab = NULL;
   GdkSurface *grab_window = NULL;
 
-  gint button;
+  int button;
 
   gchar buf[256];
   gboolean return_val = FALSE;
@@ -2308,7 +2308,7 @@ gdk_event_translate (MSG  *msg,
     {
       if (both_shift_pressed[0] != 0 && both_shift_pressed[1] != 0)
         {
-          gint tmp_retval;
+          int tmp_retval;
           MSG fake_release = *msg;
           int pressed_shift = msg->lParam & 0xffffff;
 
@@ -2508,7 +2508,7 @@ gdk_event_translate (MSG  *msg,
 
       if (pointer_grab == NULL && implicit_grab_surface != NULL)
        {
-         gint state = build_pointer_event_state (msg);
+         int state = build_pointer_event_state (msg);
 
          /* We keep the implicit grab until no buttons at all are held down */
          if ((state & GDK_ANY_BUTTON_MASK & ~(GDK_BUTTON1_MASK << (button - 1))) == 0)
@@ -3602,7 +3602,7 @@ _gdk_win32_display_queue_events (GdkDisplay *display)
 
 static gboolean
 gdk_event_prepare (GSource *source,
-                  gint    *timeout)
+                  int     *timeout)
 {
   GdkWin32EventSource *event_source = (GdkWin32EventSource *)source;
   gboolean retval;
index 965f04a46ac6cd192008ea78a91c68968ec4e012..9aee9b23911c9c38cb5364ac29f33b67e4cf7e04 100644 (file)
@@ -276,17 +276,17 @@ _get_dummy_window_hwnd (GdkWGLDummy *dummy)
                     NULL);
 }
 
-static gint
+static int
 _gdk_init_dummy_context (GdkWGLDummy *dummy);
 
 #define PIXEL_ATTRIBUTES 17
 
-static gint
+static int
 _get_wgl_pfd (HDC                    hdc,
               PIXELFORMATDESCRIPTOR *pfd,
               GdkWin32Display       *display)
 {
-  gint best_pf = 0;
+  int best_pf = 0;
 
   pfd->nSize = sizeof (PIXELFORMATDESCRIPTOR);
 
@@ -294,9 +294,9 @@ _get_wgl_pfd (HDC                    hdc,
     {
       GdkWGLDummy dummy;
       UINT num_formats;
-      gint colorbits = GetDeviceCaps (hdc, BITSPIXEL);
+      int colorbits = GetDeviceCaps (hdc, BITSPIXEL);
       guint extra_fields = 1;
-      gint i = 0;
+      int i = 0;
       int pixelAttribs[PIXEL_ATTRIBUTES];
 
       /* Save up the HDC and HGLRC that we are currently using, to restore back to it when we are done here */
@@ -384,12 +384,12 @@ _get_wgl_pfd (HDC                    hdc,
 /* in WGL, for many OpenGL items, we need a dummy WGL context, so create
  * one and cache it for later use
  */
-static gint
+static int
 _gdk_init_dummy_context (GdkWGLDummy *dummy)
 {
   PIXELFORMATDESCRIPTOR pfd;
   gboolean set_pixel_format_result = FALSE;
-  gint best_idx = 0;
+  int best_idx = 0;
 
   _get_dummy_window_hwnd (dummy);
 
@@ -419,7 +419,7 @@ static gboolean
 _gdk_win32_display_init_gl (GdkDisplay *display)
 {
   GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
-  gint best_idx = 0;
+  int best_idx = 0;
   GdkWGLDummy dummy;
 
   if (display_win32->have_wgl)
@@ -628,7 +628,7 @@ gl_fail:
 
 static gboolean
 _set_pixformat_for_hdc (HDC              hdc,
-                        gint            *best_idx,
+                        int             *best_idx,
                         GdkWin32Display *display)
 {
   PIXELFORMATDESCRIPTOR pfd;
@@ -658,13 +658,13 @@ gdk_win32_gl_context_realize (GdkGLContext *context,
 
   /* These are the real WGL context items that we will want to use later */
   HGLRC hglrc;
-  gint pixel_format;
+  int pixel_format;
   gboolean debug_bit, compat_bit, legacy_bit;
 
   /* request flags and specific versions for core (3.2+) WGL context */
-  gint flags = 0;
-  gint glver_major = 0;
-  gint glver_minor = 0;
+  int flags = 0;
+  int glver_major = 0;
+  int glver_minor = 0;
 
   GdkSurface *surface = gdk_gl_context_get_surface (context);
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (surface);
@@ -870,8 +870,8 @@ _gdk_win32_display_make_gl_context_current (GdkDisplay *display,
  */
 gboolean
 gdk_win32_display_get_wgl_version (GdkDisplay *display,
-                                   gint *major,
-                                   gint *minor)
+                                   int *major,
+                                   int *minor)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
 
index 12e228be2c7b05f2d75a6251a9cf50c42fc40aa9..1904876a12680e85a52d6bde7cfe6d8156cb4bdb 100644 (file)
 GdkDisplay      *_gdk_display = NULL;
 GdkDeviceManagerWin32 *_gdk_device_manager = NULL;
 
-gint             _gdk_offset_x, _gdk_offset_y;
+int              _gdk_offset_x, _gdk_offset_y;
 
 HDC              _gdk_display_hdc;
 HINSTANCE        _gdk_dll_hinstance;
 HINSTANCE        _gdk_app_hmodule;
 
-gint             _gdk_input_ignore_core;
+int              _gdk_input_ignore_core;
 
 HKL              _gdk_input_locale;
 gboolean         _gdk_input_locale_is_ime = FALSE;
 UINT             _gdk_input_codepage;
 
-gint             _gdk_input_ignore_wintab = FALSE;
-gint             _gdk_max_colors = 0;
+int              _gdk_input_ignore_wintab = FALSE;
+int              _gdk_max_colors = 0;
 
 GdkWin32ModalOpKind      _modal_operation_in_progress = GDK_WIN32_MODAL_OP_NONE;
 HWND              _modal_move_resize_window = NULL;
@@ -51,4 +51,4 @@ HWND              _modal_move_resize_window = NULL;
 /* The singleton clipdrop object pointer */
 GdkWin32Clipdrop *_win32_clipdrop = NULL;
 
-GThread          *_win32_main_thread = NULL;
\ No newline at end of file
+GThread          *_win32_main_thread = NULL;
index 972008492df6ac08c9ebb3947431a06b43874b2b..976003aea32d0da797bdee6f6f01cda3e7d4811f 100644 (file)
@@ -225,11 +225,11 @@ gdk_win32_keymap_finalize (GObject *object)
 static void
 print_keysym_tab (GdkWin32Keymap *keymap)
 {
-  gint                      li;
+  int                       li;
   GdkWin32KeyGroupOptions  *options;
-  gint                      vk;
+  int                       vk;
   GdkWin32KeyLevelState     level;
-  gint                      group_size = keymap->layout_handles->len;
+  int                       group_size = keymap->layout_handles->len;
 
   for (li = 0; li < group_size; li++)
     {
@@ -258,7 +258,7 @@ print_keysym_tab (GdkWin32Keymap *keymap)
 static void
 handle_special (guint  vk,
                guint *ksymp,
-               gint   shift)
+               int    shift)
 
 {
   switch (vk)
@@ -554,9 +554,9 @@ _gdk_win32_keymap_get_decimal_mark (GdkWin32Keymap *keymap)
 }
 
 static gboolean
-layouts_are_the_same (GArray *array, HKL *hkls, gint hkls_len)
+layouts_are_the_same (GArray *array, HKL *hkls, int hkls_len)
 {
-  gint i;
+  int i;
 
   if (hkls_len != array->len)
     return FALSE;
@@ -591,7 +591,7 @@ check_that_active_layout_is_in_sync (GdkWin32Keymap *keymap)
     }
 }
 
-static gint
+static int
 sort_key_nodes_by_gdk_keyval (gconstpointer a,
                               gconstpointer b)
 {
@@ -619,11 +619,11 @@ update_keymap (GdkKeymap *gdk_keymap)
   static HKL              *hkls = NULL;
   gboolean                 no_list;
   static guint             current_serial = 0;
-  gint                     i, group;
+  int                      i, group;
   GdkWin32KeyLevelState    level;
   GdkWin32KeyGroupOptions *options;
   GdkWin32Keymap          *keymap = GDK_WIN32_KEYMAP (gdk_keymap);
-  gint                     keysym_tab_size;
+  int                      keysym_tab_size;
 
   guchar                   key_state[KEY_STATE_SIZE];
   guint                    scancode;
@@ -760,7 +760,7 @@ update_keymap (GdkKeymap *gdk_keymap)
                   ((vk == VK_DECIMAL) && (level == GDK_WIN32_LEVEL_NONE)))
                 {
                   wchar_t         wcs[10];
-                  gint            k;
+                  int             k;
                   guint           keysym;
                   GdkWin32KeyNode dead_key;
 
@@ -855,7 +855,7 @@ update_keymap (GdkKeymap *gdk_keymap)
       for (i = 0; i < options->dead_keys->len; i++)
         {
           wchar_t          wcs[10];
-          gint             k;
+          int              k;
           GdkWin32KeyNode *dead_key;
           GdkWin32KeyNode  combo;
 
@@ -1027,7 +1027,7 @@ gdk_win32_keymap_check_compose (GdkWin32Keymap *keymap,
                                 guint16        *output,
                                 gsize          *output_len)
 {
-  gint partial_match;
+  int partial_match;
   guint8 active_group;
   gsize deadkey_i, node_i;
   GdkWin32KeyNode *dead_key;
@@ -1149,7 +1149,7 @@ _gdk_win32_keymap_set_active_layout (GdkWin32Keymap *keymap,
   if (keymap != NULL &&
       keymap->layout_handles->len > 0)
     {
-      gint group;
+      int group;
 
       for (group = 0; group < keymap->layout_handles->len; group++)
         if (g_array_index (keymap->layout_handles, HKL, group) == hkl)
@@ -1235,7 +1235,7 @@ gdk_win32_keymap_have_bidi_layouts (GdkKeymap *gdk_keymap)
   GdkWin32Keymap *keymap;
   gboolean        have_rtl = FALSE;
   gboolean        have_ltr = FALSE;
-  gint            group;
+  int             group;
   GdkKeymap      *default_keymap = gdk_display_get_keymap (gdk_display_get_default ());
 
   if (gdk_keymap == NULL || gdk_keymap != default_keymap)
@@ -1294,7 +1294,7 @@ gdk_win32_keymap_get_entries_for_keyval (GdkKeymap     *gdk_keymap,
   /* Accept only the default keymap */
   if (gdk_keymap == NULL || gdk_keymap == default_keymap)
     {
-      gint vk;
+      int vk;
       GdkWin32Keymap *keymap;
 
       if (gdk_keymap == NULL)
@@ -1306,7 +1306,7 @@ gdk_win32_keymap_get_entries_for_keyval (GdkKeymap     *gdk_keymap,
 
       for (vk = 0; vk < KEY_STATE_SIZE; vk++)
         {
-          gint group;
+          int group;
 
           for (group = 0; group < keymap->layout_handles->len; group++)
             {
@@ -1356,11 +1356,11 @@ gdk_win32_keymap_get_entries_for_keycode (GdkKeymap     *gdk_keymap,
                                           guint          hardware_keycode,
                                           GdkKeymapKey **keys,
                                           guint        **keyvals,
-                                          gint          *n_entries)
+                                          int           *n_entries)
 {
   GArray         *key_array;
   GArray         *keyval_array;
-  gint            group;
+  int             group;
   GdkWin32Keymap *keymap;
   GdkKeymap      *default_keymap = gdk_display_get_keymap (gdk_display_get_default ());
 
@@ -1483,10 +1483,10 @@ static gboolean
 gdk_win32_keymap_translate_keyboard_state (GdkKeymap       *gdk_keymap,
                                            guint            hardware_keycode,
                                            GdkModifierType  state,
-                                           gint             group,
+                                           int              group,
                                            guint           *keyval,
-                                           gint            *effective_group,
-                                           gint            *level,
+                                           int             *effective_group,
+                                           int             *level,
                                            GdkModifierType *consumed_modifiers)
 {
   GdkWin32Keymap *keymap;
index 4c9f5e745644edfe2460c3a58610474709eea892..ea71f046b355a9e27e59fc1a7899d1928aa0ea54 100644 (file)
@@ -170,7 +170,7 @@ _gdk_win32_print_system_palette (void)
   g_free (pe);
 }
 
-static gint
+static int
 palette_size (HPALETTE hpal)
 {
   WORD npal = 0;
@@ -185,7 +185,7 @@ void
 _gdk_win32_print_hpalette (HPALETTE hpal)
 {
   PALETTEENTRY *pe;
-  gint n, npal;
+  int n, npal;
 
   npal = palette_size (hpal);
   pe = g_new (PALETTEENTRY, npal);
index 1a6d571d0d9c56a08b244728af95425b6ede7b67..4171965fc7739e434a3c2961faf24b3bcf1a70b5 100644 (file)
@@ -396,7 +396,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
   UINT32 dispconf_path_count;
   fixedDISPLAYCONFIG_PATH_INFO *dispconf_paths;
   DISPLAYCONFIG_MODE_INFO *dispconf_modes;
-  gint path_index;
+  int path_index;
 
   user32 = LoadLibraryA ("user32.dll");
 
@@ -453,7 +453,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors)
   for (path_index = 0; path_index < dispconf_path_count; path_index++)
     {
       fixedDISPLAYCONFIG_TARGET_DEVICE_NAME tdn;
-      gint i;
+      int i;
       GdkWin32Monitor *w32mon;
       GdkMonitor *mon;
       gchar *path, *path_lower;
@@ -742,7 +742,7 @@ enum_monitor (HMONITOR hmonitor,
 static void
 prune_monitors (EnumMonitorData *data)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < data->monitors->len; i++)
     {
@@ -759,7 +759,7 @@ GPtrArray *
 _gdk_win32_display_get_monitor_list (GdkWin32Display *win32_display)
 {
   EnumMonitorData data;
-  gint i;
+  int i;
 
   data.display = win32_display;
   data.monitors = get_monitor_devices (win32_display);
index e9d92d0df66c13c76b1e63bde5b8feaac2bd65ad..86c01573693d02d3588bf696cddc19cf4ff19220 100644 (file)
@@ -163,22 +163,22 @@ gulong _gdk_win32_get_next_tick (gulong suggested_tick);
 
 void _gdk_surface_init_position     (GdkSurface *window);
 void _gdk_surface_move_resize_child (GdkSurface *window,
-                                     gint       x,
-                                     gint       y,
-                                     gint       width,
-                                     gint       height);
+                                     int        x,
+                                     int        y,
+                                     int        width,
+                                     int        height);
 
 gboolean _gdk_win32_surface_enable_transparency (GdkSurface *window);
 
 
 /* GdkSurfaceImpl methods */
 void _gdk_win32_surface_scroll (GdkSurface *window,
-                                gint       dx,
-                                gint       dy);
+                                int        dx,
+                                int        dy);
 void _gdk_win32_surface_move_region (GdkSurface       *window,
                                      const cairo_region_t *region,
-                                     gint             dx,
-                                     gint             dy);
+                                     int              dx,
+                                     int              dy);
 
 
 void _gdk_win32_selection_init (void);
@@ -189,8 +189,8 @@ void     gdk_win32_handle_table_insert  (HANDLE   *handle,
 void     gdk_win32_handle_table_remove  (HANDLE handle);
 
 HRGN      _gdk_win32_cairo_region_to_hrgn (const cairo_region_t *region,
-                                           gint                  x_origin,
-                                           gint                  y_origin);
+                                           int                   x_origin,
+                                           int                   y_origin);
 
 cairo_region_t *_gdk_win32_hrgn_to_region    (HRGN  hrgn,
                                               guint scale);
@@ -270,13 +270,13 @@ extern GdkDeviceManagerWin32 *_gdk_device_manager;
  * to the left and/or above the primary monitor) to get GDK
  * coordinates, which should be non-negative on the whole screen.
  */
-extern gint              _gdk_offset_x, _gdk_offset_y;
+extern int               _gdk_offset_x, _gdk_offset_y;
 
 extern HDC               _gdk_display_hdc;
 extern HINSTANCE         _gdk_dll_hinstance;
 extern HINSTANCE         _gdk_app_hmodule;
 
-extern gint              _gdk_input_ignore_core;
+extern int               _gdk_input_ignore_core;
 
 /* These are thread specific, but GDK/win32 works OK only when invoked
  * from a single thread anyway.
@@ -316,15 +316,15 @@ void  _gdk_win32_end_modal_call (GdkWin32ModalOpKind kind);
 
 /* Options */
 extern gboolean          _gdk_input_ignore_wintab;
-extern gint              _gdk_max_colors;
+extern int               _gdk_max_colors;
 
 /* Convert a pixbuf to an HICON (or HCURSOR).  Supports alpha under
  * Windows XP, thresholds alpha otherwise.
  */
 HICON _gdk_win32_texture_to_hicon  (GdkTexture *texture);
 HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
-                                    gint       x_hotspot,
-                                    gint       y_hotspot);
+                                    int        x_hotspot,
+                                    int        y_hotspot);
 
 void _gdk_win32_display_init_cursors (GdkWin32Display     *display);
 void _gdk_win32_display_finalize_cursors (GdkWin32Display *display);
@@ -351,14 +351,14 @@ typedef struct _Win32Cursor Win32Cursor;
 struct _Win32Cursor {
   GdkWin32CursorLoadType load_type;
   gunichar2 *resource_name;
-  gint width;
-  gint height;
+  int width;
+  int height;
   guint load_flags;
-  gint xcursor_number;
+  int xcursor_number;
 };
 
 Win32CursorTheme *win32_cursor_theme_load             (const gchar      *name,
-                                                       gint              size);
+                                                       int               size);
 Win32Cursor *     win32_cursor_theme_get_cursor       (Win32CursorTheme *theme,
                                                        const gchar      *name);
 void              win32_cursor_theme_destroy          (Win32CursorTheme *theme);
@@ -420,8 +420,8 @@ gboolean _gdk_win32_get_window_rect             (GdkSurface  *window,
 void     _gdk_win32_do_emit_configure_event     (GdkSurface  *window,
                                                  RECT        rect);
 void      gdk_win32_surface_do_move_resize_drag  (GdkSurface  *window,
-                                                  gint        x,
-                                                  gint        y);
+                                                  int         x,
+                                                  int         y);
 void      gdk_win32_surface_end_move_resize_drag (GdkSurface  *window);
 gboolean _gdk_win32_surface_fill_min_max_info    (GdkSurface  *window,
                                                   MINMAXINFO *mmi);
index 7fbf644b5e88e2a5df63b24647d86958f8c63355..a5c9ade81ad8e2f78688593af15ebf75c99e1170 100644 (file)
@@ -40,7 +40,7 @@ _get_system_font_name (HDC hdc)
   PangoFontDescription *font_desc;
   gchar *result, *font_desc_string;
   int logpixelsy;
-  gint font_size;
+  int font_size;
 
   ncm.cbSize = sizeof(NONCLIENTMETRICSW);
   if (!SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0))
@@ -107,21 +107,21 @@ _gdk_win32_get_setting (const gchar *name,
    */
   if (strcmp ("gtk-double-click-time", name) == 0)
     {
-      gint i = GetDoubleClickTime ();
+      int i = GetDoubleClickTime ();
       GDK_NOTE(MISC, g_print("gdk_display_get_setting(\"%s\") : %d\n", name, i));
       g_value_set_int (value, i);
       return TRUE;
     }
   else if (strcmp ("gtk-double-click-distance", name) == 0)
     {
-      gint i = MAX(GetSystemMetrics (SM_CXDOUBLECLK), GetSystemMetrics (SM_CYDOUBLECLK));
+      int i = MAX(GetSystemMetrics (SM_CXDOUBLECLK), GetSystemMetrics (SM_CYDOUBLECLK));
       GDK_NOTE(MISC, g_print("gdk_display_get_setting(\"%s\") : %d\n", name, i));
       g_value_set_int (value, i);
       return TRUE;
     }
   else if (strcmp ("gtk-dnd-drag-threshold", name) == 0)
     {
-      gint i = MAX(GetSystemMetrics (SM_CXDRAG), GetSystemMetrics (SM_CYDRAG));
+      int i = MAX(GetSystemMetrics (SM_CXDRAG), GetSystemMetrics (SM_CYDRAG));
       GDK_NOTE(MISC, g_print("gdk_display_get_setting(\"%s\") : %d\n", name, i));
       g_value_set_int (value, i);
       return TRUE;
index 3b26a475ab0e5ff5fa69c0761465f8c5263e2638..428311904b8ca834b047008ef8e84374f1358341 100644 (file)
@@ -211,10 +211,10 @@ gdk_surface_win32_finalize (GObject *object)
 
 void
 _gdk_win32_get_window_client_area_rect (GdkSurface *window,
-                                        gint        scale,
+                                        int         scale,
                                         RECT       *rect)
 {
-  gint x, y, width, height;
+  int x, y, width, height;
 
   x = y = 0;
   width = gdk_surface_get_width (window);
@@ -488,10 +488,10 @@ _gdk_win32_display_create_surface (GdkDisplay     *display,
   GdkSurface *surface;
   const gchar *title;
   wchar_t *wtitle;
-  gint window_width, window_height;
-  gint window_x, window_y;
-  gint offset_x = 0, offset_y = 0;
-  gint real_x = 0, real_y = 0;
+  int window_width, window_height;
+  int window_x, window_y;
+  int offset_x = 0, offset_y = 0;
+  int real_x = 0, real_y = 0;
   GdkFrameClock *frame_clock;
 
   g_return_val_if_fail (display == _gdk_display, NULL);
@@ -750,8 +750,8 @@ gdk_win32_surface_destroy_notify (GdkSurface *window)
 
 static void
 get_outer_rect (GdkSurface *window,
-               gint       width,
-               gint       height,
+               int        width,
+               int        height,
                RECT      *rect)
 {
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
@@ -765,16 +765,16 @@ get_outer_rect (GdkSurface *window,
 
 static void
 adjust_for_gravity_hints (GdkSurface *window,
-                         RECT      *outer_rect,
-                         gint          *x,
-                         gint          *y)
+                         RECT       *outer_rect,
+                         int        *x,
+                         int        *y)
 {
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
 
   if (impl->hint_flags & GDK_HINT_WIN_GRAVITY)
     {
 #ifdef G_ENABLE_DEBUG
-      gint orig_x = *x, orig_y = *y;
+      int orig_x = *x, orig_y = *y;
 #endif
 
       switch (impl->hints.win_gravity)
@@ -1106,7 +1106,7 @@ gdk_win32_surface_hide (GdkSurface *window)
 
 static void
 gdk_win32_surface_do_move (GdkSurface *window,
-                           gint x, gint y)
+                           int x, int y)
 {
   RECT outer_rect;
   GdkWin32Surface *impl;
@@ -1143,7 +1143,7 @@ gdk_win32_surface_do_move (GdkSurface *window,
 
 void
 gdk_win32_surface_resize (GdkSurface *window,
-                        gint width, gint height)
+                        int width, int height)
 {
   RECT outer_rect;
 
@@ -1182,10 +1182,10 @@ gdk_win32_surface_resize (GdkSurface *window,
 
 static void
 gdk_win32_surface_do_move_resize (GdkSurface *window,
-                                  gint        x,
-                                  gint        y,
-                                  gint        width,
-                                  gint        height)
+                                  int         x,
+                                  int         y,
+                                  int         width,
+                                  int         height)
 {
   RECT outer_rect;
   GdkWin32Surface *impl;
@@ -1233,10 +1233,10 @@ gdk_win32_surface_do_move_resize (GdkSurface *window,
 static void
 gdk_win32_surface_move_resize_internal (GdkSurface *window,
                                         gboolean    with_move,
-                                        gint        x,
-                                        gint        y,
-                                        gint        width,
-                                        gint        height)
+                                        int         x,
+                                        int         y,
+                                        int         width,
+                                        int         height)
 {
   GdkWin32Surface *surface = GDK_WIN32_SURFACE (window);
 
@@ -1271,18 +1271,18 @@ gdk_win32_surface_move_resize_internal (GdkSurface *window,
 
 void
 gdk_win32_surface_move_resize (GdkSurface *window,
-                               gint        x,
-                               gint        y,
-                               gint        width,
-                               gint        height)
+                               int         x,
+                               int         y,
+                               int         width,
+                               int         height)
 {
   gdk_win32_surface_move_resize_internal (window, TRUE, x, y, width, height);
 }
 
 void
 gdk_win32_surface_move (GdkSurface *surface,
-                        gint        x,
-                        gint        y)
+                        int         x,
+                        int         y)
 {
   gdk_win32_surface_move_resize_internal (surface, TRUE, x, y, -1, -1);
 }
@@ -1706,10 +1706,10 @@ _gdk_modal_current (void)
 
 static void
 gdk_win32_surface_get_geometry (GdkSurface *window,
-                              gint      *x,
-                              gint      *y,
-                              gint      *width,
-                              gint      *height)
+                              int       *x,
+                              int       *y,
+                              int       *width,
+                              int       *height)
 {
   if (!GDK_SURFACE_DESTROYED (window))
     {
@@ -1772,13 +1772,13 @@ gdk_win32_surface_get_geometry (GdkSurface *window,
 
 static void
 gdk_win32_surface_get_root_coords (GdkSurface *window,
-                                 gint       x,
-                                 gint       y,
-                                 gint      *root_x,
-                                 gint      *root_y)
+                                 int        x,
+                                 int        y,
+                                 int       *root_x,
+                                 int       *root_y)
 {
-  gint tx;
-  gint ty;
+  int tx;
+  int ty;
   POINT pt;
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
 
@@ -2051,10 +2051,10 @@ calculate_aerosnap_regions (GdkW32DragMoveResizeContext *context)
 {
   GdkDisplay *display;
   GListModel *monitors;
-  gint monitor_idx, other_monitor_idx;
+  int monitor_idx, other_monitor_idx;
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (context->window);
 #if defined(MORE_AEROSNAP_DEBUGGING)
-  gint i;
+  int i;
 #endif
 
   display = gdk_display_get_default ();
@@ -2072,8 +2072,8 @@ calculate_aerosnap_regions (GdkW32DragMoveResizeContext *context)
       AeroSnapEdgeRegion snap_region;
       gboolean move_edge[4] = { TRUE, FALSE, TRUE, TRUE };
       gboolean resize_edge[2] = { TRUE, TRUE };
-      gint diff;
-      gint thickness, trigger_thickness;
+      int diff;
+      int thickness, trigger_thickness;
       GdkMonitor *monitor;
 
       monitor = g_list_model_get_item (monitors, monitor_idx);
@@ -2306,9 +2306,9 @@ static void
 stash_window (GdkSurface          *window,
               GdkWin32Surface *impl)
 {
-  gint x, y;
-  gint width, wwidth;
-  gint height, wheight;
+  int x, y;
+  int width, wwidth;
+  int height, wheight;
   WINDOWPLACEMENT placement;
   HMONITOR hmonitor;
   MONITORINFO hmonitor_info;
@@ -2379,8 +2379,8 @@ static void
 snap_up (GdkSurface *window)
 {
   SHORT maxysize;
-  gint x, y;
-  gint width, height;
+  int x, y;
+  int width, height;
   GdkWin32Surface *impl;
 
   impl = GDK_WIN32_SURFACE (window);
@@ -2475,7 +2475,7 @@ _gdk_win32_surface_handle_aerosnap (GdkSurface            *window,
   GdkWin32Surface *impl;
   GdkDisplay *display;
   GListModel *monitors;
-  gint n_monitors;
+  int n_monitors;
   GdkSurfaceState surface_state = gdk_toplevel_get_state (GDK_TOPLEVEL (window));
   gboolean minimized = surface_state & GDK_SURFACE_STATE_MINIMIZED;
   gboolean maximized = surface_state & GDK_SURFACE_STATE_MAXIMIZED;
@@ -2563,7 +2563,7 @@ _gdk_win32_surface_handle_aerosnap (GdkSurface            *window,
       else if (impl->snap_state == GDK_WIN32_AEROSNAP_STATE_HALFRIGHT)
        {
           GdkMonitor *other;
-         gint i;
+         int i;
 
          unsnap (window, monitor);
           for (i = 0; i < n_monitors; i++)
@@ -2695,8 +2695,8 @@ ensure_snap_indicator_exists (GdkW32DragMoveResizeContext *context)
 
 static gboolean
 ensure_snap_indicator_surface (GdkW32DragMoveResizeContext *context,
-                          gint                         width,
-                          gint                         height,
+                          int                          width,
+                          int                          height,
                           guint                        scale)
 {
   if (context->indicator_surface != NULL &&
@@ -2731,7 +2731,7 @@ adjust_indicator_rectangle (GdkRectangle *rect,
                             gboolean      inward)
 {
   gdouble inverter;
-  const gint gap = AEROSNAP_INDICATOR_EDGE_GAP;
+  const int gap = AEROSNAP_INDICATOR_EDGE_GAP;
 #if defined(MORE_AEROSNAP_DEBUGGING)
   GdkRectangle cache = *rect;
 #endif
@@ -2755,10 +2755,10 @@ adjust_indicator_rectangle (GdkRectangle *rect,
 
 static void
 rounded_rectangle (cairo_t  *cr,
-                   gint      x,
-                   gint      y,
-                   gint      width,
-                   gint      height,
+                   int       x,
+                   int       y,
+                   int       width,
+                   int       height,
                    gdouble   radius,
                    gdouble   line_width,
                    GdkRGBA  *fill,
@@ -3194,8 +3194,8 @@ get_monitor_at_point (GdkDisplay *display,
 static void
 start_indicator (GdkSurface                   *window,
                  GdkW32DragMoveResizeContext *context,
-                 gint                         x,
-                 gint                         y,
+                 int                          x,
+                 int                          y,
                  GdkWin32AeroSnapState        state)
 {
   GdkMonitor *monitor;
@@ -3266,12 +3266,12 @@ stop_indicator (GdkSurface                   *window,
                            SWP_NOSIZE | SWP_NOREDRAW | SWP_HIDEWINDOW | SWP_NOACTIVATE));
 }
 
-static gint
-point_in_aerosnap_region (gint                x,
-                          gint                y,
+static int
+point_in_aerosnap_region (int                 x,
+                          int                 y,
                           AeroSnapEdgeRegion *region)
 {
-  gint edge, trigger;
+  int edge, trigger;
 
   edge = (x >= region->edge.x &&
           y >= region->edge.y &&
@@ -3287,15 +3287,15 @@ point_in_aerosnap_region (gint                x,
 static void
 handle_aerosnap_move_resize (GdkSurface                   *window,
                              GdkW32DragMoveResizeContext *context,
-                             gint                         x,
-                             gint                         y)
+                             int                          x,
+                             int                          y)
 {
-  gint i;
+  int i;
   AeroSnapEdgeRegion *reg;
-  gint maximize = 0;
-  gint halfleft = 0;
-  gint halfright = 0;
-  gint fullup = 0;
+  int maximize = 0;
+  int halfleft = 0;
+  int halfright = 0;
+  int fullup = 0;
   gboolean fullup_edge = FALSE;
 
   if (context->op == GDK_WIN32_DRAGOP_RESIZE)
@@ -3505,9 +3505,9 @@ setup_drag_move_resize_context (GdkSurface                   *window,
                                 GdkW32WindowDragOp           op,
                                 GdkSurfaceEdge                edge,
                                 GdkDevice                   *device,
-                                gint                         button,
-                                gint                         x,
-                                gint                         y,
+                                int                          button,
+                                int                          x,
+                                int                          y,
                                 guint32                      timestamp)
 {
   RECT rect;
@@ -3515,7 +3515,7 @@ setup_drag_move_resize_context (GdkSurface                   *window,
   GdkSurface *pointer_window;
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
   gboolean maximized = gdk_toplevel_get_state (GDK_TOPLEVEL (window)) & GDK_SURFACE_STATE_MAXIMIZED;
-  gint root_x, root_y;
+  int root_x, root_y;
 
   gdk_win32_surface_get_root_coords (window, x, y, &root_x, &root_y);
 
@@ -3571,10 +3571,10 @@ setup_drag_move_resize_context (GdkSurface                   *window,
             impl->snap_state == GDK_WIN32_AEROSNAP_STATE_FULLUP))
     {
       GdkMonitor *monitor;
-      gint wx, wy, wwidth, wheight;
-      gint swx, swy, swwidth, swheight;
+      int wx, wy, wwidth, wheight;
+      int swx, swy, swwidth, swheight;
       gboolean pointer_outside_of_window;
-      gint offsetx, offsety;
+      int offsetx, offsety;
       gboolean left_half;
       GdkDisplay *display;
 
@@ -3632,8 +3632,8 @@ setup_drag_move_resize_context (GdkSurface                   *window,
       if (!pointer_outside_of_window && maximized)
         {
           WINDOWPLACEMENT placement;
-          gint unmax_width, unmax_height;
-          gint shadow_unmax_width, shadow_unmax_height;
+          int unmax_width, unmax_height;
+          int shadow_unmax_width, shadow_unmax_height;
 
           placement.length = sizeof (placement);
           API_CALL (GetWindowPlacement, (GDK_SURFACE_HWND (window), &placement));
@@ -3937,17 +3937,17 @@ _gdk_win32_update_layered_window_from_cache (GdkSurface *surface,
 
 void
 gdk_win32_surface_do_move_resize_drag (GdkSurface *window,
-                                      gint       x,
-                                      gint       y)
+                                      int        x,
+                                      int        y)
 {
   RECT rect;
   RECT new_rect;
-  gint diffy, diffx;
+  int diffy, diffx;
   MINMAXINFO mmi;
   GdkWin32Surface *impl;
   GdkW32DragMoveResizeContext *context;
-  gint width;
-  gint height;
+  int width;
+  int height;
 
   impl = GDK_WIN32_SURFACE (window);
   context = &impl->drag_move_resize_context;
@@ -4289,7 +4289,7 @@ gdk_win32_surface_unmaximize (GdkSurface *window)
 static void
 gdk_win32_surface_fullscreen (GdkSurface *window)
 {
-  gint x, y, width, height;
+  int x, y, width, height;
   FullscreenInfo *fi;
   HMONITOR monitor;
   MONITORINFO mi;
@@ -4465,7 +4465,7 @@ gdk_win32_surface_show_window_menu (GdkSurface *window,
                                    GdkEvent  *event)
 {
   double event_x, event_y;
-  gint x, y;
+  int x, y;
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
 
   switch ((int) event->event_type)
@@ -4586,10 +4586,10 @@ GtkShowWindow (GdkSurface *window,
 
 static void
 gdk_win32_surface_set_shadow_width (GdkSurface *window,
-                                   gint       left,
-                                   gint       right,
-                                   gint       top,
-                                   gint       bottom)
+                                   int        left,
+                                   int        right,
+                                   int        top,
+                                   int        bottom)
 {
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
 
@@ -4614,7 +4614,7 @@ gdk_win32_surface_set_shadow_width (GdkSurface *window,
 }
 
 
-gint
+int
 _gdk_win32_surface_get_scale_factor (GdkSurface *window)
 {
   GdkDisplay *display;
@@ -4663,8 +4663,8 @@ _gdk_win32_surface_get_scale_factor (GdkSurface *window)
 
 void
 _gdk_win32_surface_get_unscaled_size (GdkSurface *window,
-                                    gint      *unscaled_width,
-                                    gint      *unscaled_height)
+                                    int       *unscaled_width,
+                                    int       *unscaled_height)
 {
   GdkWin32Surface *impl = GDK_WIN32_SURFACE (window);
 
index c7bbba48588b006f56c9154a13ca859b2d3b476f..84e7dbaee090e0688cbb735eaa2c2bf4868da70d 100644 (file)
@@ -117,14 +117,14 @@ struct _GdkW32DragMoveResizeContext
    * The op will be canceled only when *this* button
    * is released.
    */
-  gint               button;
+  int                button;
 
   /* Initial cursor position when the operation began.
    * Current cursor position is subtracted from it to find how far
    * to move window border(s).
    */
-  gint               start_root_x;
-  gint               start_root_y;
+  int                start_root_x;
+  int                start_root_y;
 
   /* Initial window rectangle (position and size).
    * The window is resized/moved relative to this (see start_root_*).
@@ -153,8 +153,8 @@ struct _GdkW32DragMoveResizeContext
 
   /* Used to draw the indicator */
   cairo_surface_t   *indicator_surface;
-  gint               indicator_surface_width;
-  gint               indicator_surface_height;
+  int                indicator_surface_width;
+  int                indicator_surface_height;
 
   /* Size/position of shape_indicator */
   GdkRectangle       indicator_window_rect;
@@ -240,7 +240,7 @@ struct _GdkWin32Surface
   wchar_t leading_surrogate_keyup;
 
   /* Window size hints */
-  gint hint_flags;
+  int hint_flags;
   GdkGeometry hints;
 
   /* Non-NULL for any window that is registered as a drop target.
@@ -256,18 +256,18 @@ struct _GdkWin32Surface
 
   GdkSurface *transient_owner;
   GSList    *transient_children;
-  gint       num_transients;
+  int        num_transients;
   gboolean   changing_state;
 
-  gint initial_x;
-  gint initial_y;
+  int initial_x;
+  int initial_y;
 
   /* left/right/top/bottom width of the shadow/resize-grip around the window */
   RECT margins;
 
   /* left+right and top+bottom from @margins */
-  gint margins_x;
-  gint margins_y;
+  int margins_x;
+  int margins_y;
 
   /* Set to TRUE when GTK tells us that margins are 0 everywhere.
    * We don't actually set margins to 0, we just set this bit.
@@ -304,8 +304,8 @@ struct _GdkWin32Surface
    * does not provide a way to query its size,
    * so we have to remember it ourselves.
    */
-  gint             dib_width;
-  gint             dib_height;
+  int              dib_width;
+  int              dib_height;
 
   /* If the client wants uniformly-transparent window,
    * we remember the opacity value here and apply it
@@ -348,9 +348,9 @@ struct _GdkWin32Surface
   LONG_PTR temp_styles;
 
   /* scale of window on HiDPI */
-  gint surface_scale;
-  gint unscaled_width;
-  gint unscaled_height;
+  int surface_scale;
+  int unscaled_width;
+  int unscaled_height;
 };
 
 struct _GdkWin32SurfaceClass
@@ -362,10 +362,10 @@ GType _gdk_win32_surface_get_type (void);
 
 void  _gdk_win32_surface_update_style_bits   (GdkSurface *window);
 
-gint  _gdk_win32_surface_get_scale_factor    (GdkSurface *window);
+int   _gdk_win32_surface_get_scale_factor    (GdkSurface *window);
 
 void  _gdk_win32_get_window_client_area_rect (GdkSurface *window,
-                                              gint        scale,
+                                              int         scale,
                                               RECT       *rect);
 void  _gdk_win32_update_layered_window_from_cache (GdkSurface *window,
                                                    RECT       *client_rect,
@@ -374,18 +374,18 @@ void  _gdk_win32_update_layered_window_from_cache (GdkSurface *window,
                                                    gboolean    do_paint);
 
 void gdk_win32_surface_move (GdkSurface *surface,
-                             gint        x,
-                             gint        y);
+                             int         x,
+                             int         y);
 
 void gdk_win32_surface_move_resize (GdkSurface *window,
-                                    gint        x,
-                                    gint        y,
-                                    gint        width,
-                                    gint        height);
+                                    int         x,
+                                    int         y,
+                                    int         width,
+                                    int         height);
 
 void
 gdk_win32_surface_get_queued_window_rect (GdkSurface *surface,
-                                          gint        scale,
+                                          int         scale,
                                           RECT       *return_window_rect);
 
 void
index 2f7af043beb83ee7c828b94dde9379b67190df56..6eebe6e76dd3567d3c46f7515e8fe778618cb929 100644 (file)
@@ -55,7 +55,7 @@ GType      gdk_win32_display_get_type            (void);
 GDK_AVAILABLE_IN_ALL
 void       gdk_win32_display_set_cursor_theme    (GdkDisplay  *display,
                                                   const gchar *name,
-                                                  gint         size);
+                                                  int          size);
 
 /**
  * GdkWin32MessageFilterReturn:
@@ -88,7 +88,7 @@ typedef enum {
  */
 typedef GdkWin32MessageFilterReturn (*GdkWin32MessageFilterFunc) (GdkWin32Display *display,
                                                                   MSG             *message,
-                                                                  gint            *return_value,
+                                                                  int             *return_value,
                                                                   gpointer         data);
 
 GDK_AVAILABLE_IN_ALL
index 7fe93244665f890b1f31011d969ee550eb56466f..c19a7deead16fe15358ea51b4abee87b2b0fa19c 100644 (file)
@@ -33,8 +33,8 @@ typedef struct _GdkWin32DragUtilityData GdkWin32DragUtilityData;
  */
 struct _GdkWin32DragUtilityData
 {
-  gint             last_x;         /* Coordinates from last event, in GDK space */
-  gint             last_y;
+  int              last_x;         /* Coordinates from last event, in GDK space */
+  int              last_y;
   DWORD            last_key_state; /* Key state from last event */
   GdkWin32DndState state;
 };
@@ -74,10 +74,10 @@ struct _GdkWin32Drag
   GdkWin32DragUtilityData util_data;
 
   guint scale;             /* Temporarily caches the HiDPI scale */
-  gint  hot_x;             /* Hotspot offset from the top-left of the drag-window, scaled (can be added to GDK space coordinates) */
-  gint  hot_y;
-  gint  start_x;           /* Coordinates of the drag start, in GDK space */
-  gint  start_y;
+  int   hot_x;             /* Hotspot offset from the top-left of the drag-window, scaled (can be added to GDK space coordinates) */
+  int   hot_y;
+  int   start_x;           /* Coordinates of the drag start, in GDK space */
+  int   start_y;
 
   guint drag_status : 4;   /* Current status of drag */
   guint drop_failed : 1;   /* Whether the drop was unsuccessful */
@@ -96,21 +96,21 @@ GdkDrag *_gdk_win32_find_drag_for_dest_window     (HWND             dest_window)
 GdkDrop  *_gdk_win32_get_drop_for_dest_surface     (GdkSurface      *dest);
 
 gboolean _gdk_win32_local_drop_target_will_emit_motion   (GdkDrop *drop,
-                                                          gint     x_root,
-                                                          gint     y_root,
+                                                          int      x_root,
+                                                          int      y_root,
                                                           DWORD    grfKeyState);
 
 void     _gdk_win32_local_drop_target_dragenter          (GdkDrag        *drag,
                                                           GdkSurface     *dest_surface,
-                                                          gint            x_root,
-                                                          gint            y_root,
+                                                          int             x_root,
+                                                          int             y_root,
                                                           DWORD           grfKeyState,
                                                           guint32         time_,
                                                           GdkDragAction  *actions);
 void     _gdk_win32_local_drop_target_dragover           (GdkDrop        *drop,
                                                           GdkDrag        *drag,
-                                                          gint            x_root,
-                                                          gint            y_root,
+                                                          int             x_root,
+                                                          int             y_root,
                                                           DWORD           grfKeyState,
                                                           guint32         time_,
                                                           GdkDragAction  *actions);
index 6b55735a9d8b9c0e38c3fde7b93d1b47a579deab..825841a0bde1707012ebc134b4913b36558d1ce2 100644 (file)
@@ -41,8 +41,8 @@ GType gdk_win32_gl_context_get_type (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 gboolean        gdk_win32_display_get_wgl_version (GdkDisplay *display,
-                                                   gint       *major,
-                                                   gint       *minor);
+                                                   int        *major,
+                                                   int        *minor);
 
 G_END_DECLS
 
index 8e62e9e34bb307a3e20c83ef9052cd2893aa95c4..006e59fc7c2830a31b9a5104648760408f812481 100644 (file)
@@ -39,7 +39,7 @@ gdk_handle_hash (HANDLE *handle)
 #endif
 }
 
-static gint
+static int
 gdk_handle_equal (HANDLE *a,
                  HANDLE *b)
 {
index 94814ecd6ad0b166a46db36c3f97609e42017320..2ea28e824f9a12616761070f8338b56cf4f4bda2 100644 (file)
@@ -28,7 +28,7 @@ struct _GdkWin32ALPNSink
 {
   ITfActiveLanguageProfileNotifySink itf_alpn_sink;
 
-  gint ref_count;
+  int ref_count;
 };
 
 typedef struct _GdkWin32ALPNSink GdkWin32ALPNSink;
index 4243a39f41514f21d7da28330051d17711e4024d..03e10d12e2690d4dad535b82e3b9676d9d7ec7ea 100644 (file)
@@ -1,4 +1,4 @@
-static const struct { const gchar *name; const gchar *builtin; gint type; guchar width; guchar height; guchar hotx; guchar hoty; gchar *data; } cursors[] = {
+static const struct { const gchar *name; const gchar *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; gchar *data; } cursors[] = {
   { "X_cursor", NULL, 0, 16, 16, 7, 7, 
     "\125\000\000\125\152\100\001\251\152\220\006\251\152\244\032\251"
     "\032\251\152\244\006\252\252\220\001\252\252\100\000\152\251\000"
index 1ef76976172dd8116d0c4273824d691e3ebf8a28..04433821de7669f5a7a7429ef7fbb6a5dd3d8d78 100644 (file)
@@ -78,7 +78,7 @@ struct _ChildInfoState
 
   guint current_child;
   guint n_children_found;
-  gint current_request;
+  int current_request;
   gboolean have_error;
   gboolean child_has_error;
 };
index f7be90fbff87da7441ff76911aaf95ba73362840..009c2fae7957264535e8af3451ea58df87477728 100644 (file)
@@ -36,10 +36,10 @@ typedef void (*GdkRoundTripCallback)  (GdkDisplay *display,
 struct _GdkChildInfoX11
 {
   Window window;
-  gint x;
-  gint y;
-  gint width;
-  gint height;
+  int x;
+  int y;
+  int width;
+  int height;
   guint is_mapped : 1;
   guint has_wm_state : 1;
   guint window_class : 2;
index bd46f24a15640d7c8ed62a11ce67144a57ac6d6c..af2434fbf452ce591c63761c98e1983d754798d9 100644 (file)
@@ -141,7 +141,7 @@ static const struct {
   const char *mime_type;
   GInputStream * (* convert) (GdkX11Clipboard *, GInputStream *, const char *, int);
   const char *type;
-  gint format;
+  int format;
 } special_targets[] = {
   { "UTF8_STRING",   "text/plain;charset=utf-8", no_convert,        "UTF8_STRING",   8 },
   { "COMPOUND_TEXT", "text/plain;charset=utf-8", text_list_convert, "COMPOUND_TEXT", 8 },
index a050a70f7a659530553e79579f566966d65221db..bb05c01baf64b193e251930d80aa4d5f4ff054c8 100644 (file)
@@ -147,9 +147,9 @@ static const struct {
 
 static XcursorImage*
 create_cursor_image (GdkTexture *texture,
-                     gint        x,
-                     gint        y,
-                    gint        scale)
+                     int         x,
+                     int         y,
+                    int         scale)
 {
   XcursorImage *xcimage;
 
@@ -187,7 +187,7 @@ gdk_x11_cursor_create_for_texture (GdkDisplay *display,
 static const gchar *
 name_fallback (const gchar *name)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < G_N_ELEMENTS (name_map); i++)
     {
@@ -241,7 +241,7 @@ static Cursor
 gdk_x11_cursor_create_for_name (GdkDisplay  *display,
                                 const gchar *name)
 {
-  gint i;
+  int i;
 
   if (g_str_equal (name, "none"))
     return get_blank_cursor (display);
@@ -280,12 +280,12 @@ gdk_x11_cursor_create_for_name (GdkDisplay  *display,
 void
 gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                   const gchar *theme,
-                                  const gint   size)
+                                  const int    size)
 {
 #if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
   Display *xdisplay;
   gchar *old_theme;
-  gint old_size;
+  int old_size;
   gpointer cursor, xcursor;
   GHashTableIter iter;
 
index fbc98b83a3e20354e50720e0b4696da9e583040e..01736e6821c0b6a62b464902a4fa49e13e882ec2 100644 (file)
@@ -47,7 +47,7 @@ struct _GdkX11DeviceXI2
 {
   GdkDevice parent_instance;
 
-  gint device_id;
+  int device_id;
   GArray *scroll_valuators;
   gdouble *last_axes;
 };
@@ -199,7 +199,7 @@ gdk_x11_device_xi2_get_state (GdkDevice       *device,
     {
       GdkDisplay *display;
       XIDeviceInfo *info;
-      gint i, j, ndevices;
+      int i, j, ndevices;
       Screen *xscreen;
 
       display = gdk_device_get_display (device);
@@ -228,7 +228,7 @@ gdk_x11_device_xi2_get_state (GdkDevice       *device,
             case GDK_AXIS_Y:
             case GDK_AXIS_IGNORE:
                 {
-                  gint root_x, root_y;
+                  int root_x, root_y;
 
                   /* FIXME: Maybe root coords caching should happen here */
                   gdk_surface_get_origin (surface, &root_x, &root_y);
@@ -387,7 +387,7 @@ gdk_x11_device_xi2_grab (GdkDevice    *device,
   XIEventMask mask;
   Window xwindow;
   Cursor xcursor;
-  gint status;
+  int status;
 
   display = gdk_device_get_display (device);
   device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (GDK_X11_DISPLAY (display)->device_manager);
@@ -498,7 +498,7 @@ gdk_x11_device_xi2_surface_at_position (GdkDevice       *device,
     }
   else
     {
-      gint width, height;
+      int width, height;
       GList *toplevels, *list;
       Window pointer_window;
 
@@ -628,10 +628,10 @@ gdk_x11_device_xi2_surface_at_position (GdkDevice       *device,
 guchar *
 _gdk_x11_device_xi2_translate_event_mask (GdkX11DeviceManagerXI2 *device_manager_xi2,
                                           GdkEventMask            event_mask,
-                                          gint                   *len)
+                                          int                    *len)
 {
   guchar *mask;
-  gint minor;
+  int minor;
 
   g_object_get (device_manager_xi2, "minor", &minor, NULL);
 
@@ -707,7 +707,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state,
 
   if (buttons_state)
     {
-      gint len, i;
+      int len, i;
 
       /* We're only interested in the first 3 buttons */
       len = MIN (3, buttons_state->mask_len * 8);
@@ -827,7 +827,7 @@ _gdk_device_xi2_unset_scroll_valuators (GdkX11DeviceXI2 *device)
                           device->scroll_valuators->len);
 }
 
-gint
+int
 _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device)
 {
   g_return_val_if_fail (GDK_IS_X11_DEVICE_XI2 (device), 0);
@@ -837,7 +837,7 @@ _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device)
 
 gdouble
 gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device,
-                                        gint             n_axis)
+                                        int              n_axis)
 {
   if (n_axis >= gdk_device_get_n_axes (GDK_DEVICE (device)))
     return 0;
@@ -851,7 +851,7 @@ gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device,
 void
 gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device,
                                gdouble         *axes,
-                               gint             n_axes)
+                               int              n_axes)
 {
   g_free (device->last_axes);
 
index 1478b9242a135d247efba0de3043278d33bdfccb..5be86397e743a94cef80c065fdc1b14c651d6c78 100644 (file)
@@ -76,7 +76,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display)
  **/
 GdkDevice *
 gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manager,
-                              gint                    device_id)
+                              int                     device_id)
 {
   g_return_val_if_fail (GDK_IS_X11_DEVICE_MANAGER_XI2 (device_manager), NULL);
 
@@ -92,7 +92,7 @@ gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manager,
  *
  * Returns: the XInput2 device ID.
  **/
-gint
+int
 gdk_x11_device_get_id (GdkDevice *device)
 {
   g_return_val_if_fail (GDK_IS_DEVICE (device), 0);
index de6feaad3d57565acdbdc5b50e6f8a70e3fe9c48..ef63fb5c4d47ad55edd3ae41a50c62499663fac2 100644 (file)
@@ -88,9 +88,9 @@ struct _GdkX11DeviceManagerXI2
 
   GList *devices;
 
-  gint opcode;
-  gint major;
-  gint minor;
+  int opcode;
+  int major;
+  int minor;
 };
 
 struct _GdkX11DeviceManagerXI2Class
@@ -211,7 +211,7 @@ translate_valuator_class (GdkDisplay          *display,
   static gboolean initialized = FALSE;
   static Atom label_atoms [GDK_AXIS_LAST] = { 0 };
   GdkAxisUse use = GDK_AXIS_IGNORE;
-  gint i;
+  int i;
 
   if (!initialized)
     {
@@ -253,7 +253,7 @@ translate_device_classes (GdkDisplay      *display,
                           XIAnyClassInfo **classes,
                           guint            n_classes)
 {
-  gint i;
+  int i;
 
   g_object_freeze_notify (G_OBJECT (device));
 
@@ -317,7 +317,7 @@ static gboolean
 is_touch_device (XIAnyClassInfo **classes,
                  guint            n_classes,
                  GdkInputSource  *device_type,
-                 gint            *num_touches)
+                 int             *num_touches)
 {
 #ifdef XINPUT_2_2
   guint i;
@@ -473,7 +473,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
   GdkInputSource touch_source;
   GdkDeviceType type;
   GdkDevice *device;
-  gint num_touches = 0;
+  int num_touches = 0;
   gchar *vendor_id = NULL, *product_id = NULL;
 
   if (dev->use == XIMasterKeyboard || dev->use == XISlaveKeyboard)
@@ -666,7 +666,7 @@ detach_from_seat (GdkDevice *device)
 
 static void
 remove_device (GdkX11DeviceManagerXI2 *device_manager,
-               gint                    device_id)
+               int                     device_id)
 {
   GdkDevice *device;
 
@@ -893,7 +893,7 @@ handle_hierarchy_changed (GdkX11DeviceManagerXI2 *device_manager,
   Display *xdisplay;
   XIDeviceInfo *info;
   int ndevices;
-  gint i;
+  int i;
 
   display = device_manager->display;
   xdisplay = GDK_DISPLAY_XDISPLAY (display);
@@ -1128,7 +1128,7 @@ handle_property_change (GdkX11DeviceManagerXI2 *device_manager,
 }
 
 static GdkCrossingMode
-translate_crossing_mode (gint mode)
+translate_crossing_mode (int mode)
 {
   switch (mode)
     {
@@ -1149,7 +1149,7 @@ translate_crossing_mode (gint mode)
 }
 
 static GdkNotifyType
-translate_notify_type (gint detail)
+translate_notify_type (int detail)
 {
   switch (detail)
     {
@@ -2025,7 +2025,7 @@ gdk_x11_device_manager_xi2_get_surface (GdkEventTranslator *translator,
 
 GdkDevice *
 _gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *device_manager_xi2,
-                                    gint                    device_id)
+                                    int                     device_id)
 {
   return g_hash_table_lookup (device_manager_xi2->id_table,
                               GINT_TO_POINTER (device_id));
index ca337066b8fefc98f81acbed3cab8bc42c2202ed..ab9a1ee949762b20a6bb3311c8306b2d02eac575 100644 (file)
@@ -111,7 +111,7 @@ static GdkEvent * gdk_x11_display_translate_event (GdkEventTranslator *translato
 
 static void gdk_internal_connection_watch (Display  *display,
                                           XPointer  arg,
-                                          gint      fd,
+                                          int       fd,
                                           gboolean  opening,
                                           XPointer *watch_data);
 
@@ -119,8 +119,8 @@ typedef struct _GdkEventTypeX11 GdkEventTypeX11;
 
 struct _GdkEventTypeX11
 {
-  gint base;
-  gint n_events;
+  int base;
+  int n_events;
 };
 
 /* Note that we never *directly* use WM_LOCALE_NAME, WM_PROTOCOLS,
@@ -441,7 +441,7 @@ gdk_check_wm_desktop_changed (GdkSurface *surface)
   GdkDisplay *display = GDK_SURFACE_DISPLAY (surface);
 
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   guchar *data;
@@ -477,7 +477,7 @@ gdk_check_wm_state_changed (GdkSurface *surface)
   GdkX11Screen *screen = GDK_SURFACE_SCREEN (surface);
 
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   guchar *data;
@@ -542,7 +542,7 @@ gdk_check_edge_constraints_changed (GdkSurface *surface)
   GdkDisplay *display = GDK_SURFACE_DISPLAY (surface);
 
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   guchar *data;
@@ -923,8 +923,8 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
              !xevent->xconfigure.override_redirect &&
              !GDK_SURFACE_DESTROYED (surface))
            {
-             gint tx = 0;
-             gint ty = 0;
+             int tx = 0;
+             int ty = 0;
              Window child_window = 0;
 
               x = y = 0;
@@ -1350,7 +1350,7 @@ set_sm_client_id (GdkDisplay  *display,
 
 void
 gdk_display_setup_window_visual (GdkDisplay *display,
-                                 gint        depth,
+                                 int         depth,
                                  Visual     *visual,
                                  Colormap    colormap,
                                  gboolean    rgba)
@@ -1382,11 +1382,11 @@ gdk_x11_display_open (const gchar *display_name)
   Display *xdisplay;
   GdkDisplay *display;
   GdkX11Display *display_x11;
-  gint argc;
+  int argc;
   gchar *argv[1];
   XClassHint *class_hint;
-  gint ignore;
-  gint maj, min;
+  int ignore;
+  int maj, min;
   char *cm_name;
 
   XInitThreads ();
@@ -1549,8 +1549,8 @@ gdk_x11_display_open (const gchar *display_name)
   
 #ifdef HAVE_XKB
   {
-    gint xkb_major = XkbMajorVersion;
-    gint xkb_minor = XkbMinorVersion;
+    int xkb_major = XkbMajorVersion;
+    int xkb_minor = XkbMinorVersion;
     if (XkbLibraryVersion (&xkb_major, &xkb_minor))
       {
         xkb_major = XkbMajorVersion;
@@ -1665,7 +1665,7 @@ typedef struct _GdkInternalConnection GdkInternalConnection;
 
 struct _GdkInternalConnection
 {
-  gint          fd;
+  int           fd;
   GSource      *source;
   Display      *display;
 };
@@ -1723,7 +1723,7 @@ gdk_remove_connection_handler (GdkInternalConnection *connection)
 static void
 gdk_internal_connection_watch (Display  *display,
                               XPointer  arg,
-                              gint      fd,
+                              int       fd,
                               gboolean  opening,
                               XPointer *watch_data)
 {
@@ -1779,7 +1779,7 @@ device_grab_update_callback (GdkDisplay *display,
 void
 _gdk_x11_display_update_grab_info (GdkDisplay *display,
                                    GdkDevice  *device,
-                                   gint        status)
+                                   int         status)
 {
   if (status == GrabSuccess)
     _gdk_x11_roundtrip_async (display, device_grab_update_callback, device);
@@ -2561,7 +2561,7 @@ gdk_x11_display_error_trap_push (GdkDisplay *display)
     g_slist_prepend (display_x11->error_traps, trap);
 }
 
-static gint
+static int
 gdk_x11_display_error_trap_pop_internal (GdkDisplay *display,
                                          gboolean    need_code)
 {
@@ -2649,7 +2649,7 @@ gdk_x11_display_error_trap_pop_internal (GdkDisplay *display,
  */
 void
 gdk_x11_display_set_surface_scale (GdkDisplay *display,
-                                  gint        scale)
+                                  int         scale)
 {
   GdkX11Screen *x11_screen;
   gboolean need_reread_settings = FALSE;
@@ -2694,7 +2694,7 @@ gdk_x11_display_set_surface_scale (GdkDisplay *display,
  *
  * Returns: X error code or 0 on success
  */
-gint
+int
 gdk_x11_display_error_trap_pop (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_X11_DISPLAY (display), Success);
index 39e9219d306948ad7e2217c86305c1ddc0a910d0..c3719e9ac573ef8315cf93a42a993f8d9df639a9 100644 (file)
@@ -48,7 +48,7 @@ struct _GdkX11Display
 
   GSource *event_source;
 
-  gint grab_count;
+  int grab_count;
 
   /* Visual infos for creating Windows */
   int window_depth;
@@ -56,7 +56,7 @@ struct _GdkX11Display
   Colormap window_colormap;
 
   /* Keyboard related information */
-  gint xkb_event_type;
+  int xkb_event_type;
   gboolean use_xkb;
 
   /* Whether we were able to turn on detectable-autorepeat using
@@ -69,14 +69,14 @@ struct _GdkX11Display
   guint      keymap_serial;
 
   gboolean have_xfixes;
-  gint xfixes_event_base;
+  int xfixes_event_base;
 
   gboolean have_xcomposite;
 
   gboolean have_randr12;
   gboolean have_randr13;
   gboolean have_randr15;
-  gint xrandr_event_base;
+  int xrandr_event_base;
 
   /* If the SECURITY extension is in place, whether this client holds
    * a trusted authorization and so is allowed to make various requests
@@ -120,16 +120,16 @@ struct _GdkX11Display
 
   guint have_shapes : 1;
   guint have_input_shapes : 1;
-  gint shape_event_base;
+  int shape_event_base;
 
   GSList *error_traps;
 
-  gint wm_moveresize_button;
+  int wm_moveresize_button;
 
   /* GLX information */
-  gint glx_version;
-  gint glx_error_base;
-  gint glx_event_base;
+  int glx_version;
+  int glx_error_base;
+  int glx_event_base;
 
   /* Translation between X server time and system-local monotonic time */
   gint64 server_time_query_time;
@@ -152,8 +152,8 @@ struct _GdkX11Display
   guint has_async_glx_swap_buffers : 1;
 
 #ifdef HAVE_XDAMAGE
-  gint damage_event_base;
-  gint damage_error_base;
+  int damage_event_base;
+  int damage_error_base;
   guint have_damage;
 #endif
 };
index 5a08c3af64a33d834448154ce07b52b438b5fa9d..5e8e03fccb633ef7ffbeca38a6ea187d37eff7a9 100644 (file)
@@ -78,7 +78,7 @@ typedef enum
 
 typedef struct {
   guint32 xid;
-  gint x, y, width, height;
+  int x, y, width, height;
   gboolean mapped;
   gboolean shape_selected;
   gboolean shape_valid;
@@ -90,7 +90,7 @@ struct _GdkSurfaceCache {
   GHashTable *child_hash;
   guint old_event_mask;
   GdkDisplay *display;
-  gint ref_count;
+  int ref_count;
 };
 
 
@@ -100,8 +100,8 @@ struct _GdkX11Drag
 
   GdkDragProtocol protocol;
 
-  gint start_x;                /* Where the drag started */
-  gint start_y;
+  int start_x;                /* Where the drag started */
+  int start_y;
   guint16 last_x;              /* Coordinates from last event */
   guint16 last_y;
   gulong timestamp;            /* Timestamp we claimed the DND selection with */
@@ -118,8 +118,8 @@ struct _GdkX11Drag
   GdkDragAction actions;
   GdkDragAction current_action;
 
-  gint hot_x;
-  gint hot_y;
+  int hot_x;
+  int hot_y;
 
   Window dest_xid;             /* The last window we looked up */
   Window proxy_xid;            /* The proxy window for dest_xid (or dest_xid if no proxying happens) */
@@ -136,8 +136,8 @@ struct _GdkX11DragClass
 };
 
 typedef struct {
-  gint keysym;
-  gint modifiers;
+  int keysym;
+  int modifiers;
 } GrabKey;
 
 static GrabKey grab_keys[] = {
@@ -186,14 +186,14 @@ gdk_x11_drag_init (GdkX11Drag *drag)
 static void        gdk_x11_drag_finalize     (GObject          *object);
 static Window      gdk_x11_drag_find_surface (GdkDrag          *drag,
                                               GdkSurface       *drag_surface,
-                                              gint             x_root,
-                                              gint             y_root,
+                                              int              x_root,
+                                              int              y_root,
                                               GdkDragProtocol *protocol);
 static gboolean    gdk_x11_drag_drag_motion  (GdkDrag         *drag,
                                               Window           proxy_xid,
                                               GdkDragProtocol  protocol,
-                                              gint             x_root,
-                                              gint             y_root,
+                                              int              x_root,
+                                              int              y_root,
                                               GdkDragAction    suggested_action,
                                               GdkDragAction    possible_actions,
                                               guint32          time);
@@ -201,8 +201,8 @@ static void        gdk_x11_drag_drop         (GdkDrag         *drag,
                                               guint32          time_);
 static GdkSurface * gdk_x11_drag_get_drag_surface (GdkDrag    *drag);
 static void        gdk_x11_drag_set_hotspot  (GdkDrag         *drag,
-                                              gint             hot_x,
-                                              gint             hot_y);
+                                              int              hot_x,
+                                              int              hot_y);
 static void        gdk_x11_drag_drop_done    (GdkDrag         *drag,
                                               gboolean         success);
 static void        gdk_x11_drag_set_cursor   (GdkDrag *drag,
@@ -328,10 +328,10 @@ free_cache_child (GdkCacheChild *child,
 static void
 gdk_surface_cache_add (GdkSurfaceCache *cache,
                        guint32          xid,
-                       gint             x,
-                       gint             y,
-                       gint             width,
-                       gint             height,
+                       int              x,
+                       int              y,
+                       int              width,
+                       int              height,
                        gboolean         mapped)
 { 
   GdkCacheChild *child = g_new (GdkCacheChild, 1);
@@ -531,7 +531,7 @@ gdk_surface_cache_new (GdkDisplay *display)
       GList *toplevel_windows, *list;
       GdkSurface *surface;
       GdkX11Surface *impl;
-      gint x, y, width, height;
+      int x, y, width, height;
 
       toplevel_windows = gdk_x11_display_get_toplevel_windows (display);
       for (list = toplevel_windows; list; list = list->next)
@@ -649,8 +649,8 @@ gdk_surface_cache_get (GdkDisplay *display)
 static gboolean
 is_pointer_within_shape (GdkDisplay    *display,
                          GdkCacheChild *child,
-                         gint           x_pos,
-                         gint           y_pos)
+                         int            x_pos,
+                         int            y_pos)
 {
   if (!child->shape_selected)
     {
@@ -696,8 +696,8 @@ static Window
 get_client_window_at_coords_recurse (GdkDisplay *display,
                                      Window      win,
                                      gboolean    is_toplevel,
-                                     gint        x,
-                                     gint        y)
+                                     int         x,
+                                     int         y)
 {
   GdkChildInfoX11 *children;
   unsigned int nchildren;
@@ -749,8 +749,8 @@ get_client_window_at_coords_recurse (GdkDisplay *display,
 static Window
 get_client_window_at_coords (GdkSurfaceCache *cache,
                              Window          ignore,
-                             gint            x_root,
-                             gint            y_root)
+                             int             x_root,
+                             int             y_root)
 {
   GList *tmp_list;
   Window retval = None;
@@ -815,14 +815,14 @@ static struct {
     { "XdndActionPrivate", GDK_ACTION_COPY },
   };
 
-static const gint xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table);
+static const int xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table);
 
 static GdkDragAction
 xdnd_action_from_atom (GdkDisplay *display,
                        Atom        xatom)
 {
   const char *name;
-  gint i;
+  int i;
 
   if (xatom == None)
     return 0;
@@ -840,7 +840,7 @@ static Atom
 xdnd_action_to_atom (GdkDisplay    *display,
                      GdkDragAction  action)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < xdnd_n_actions; i++)
     if (action == xdnd_actions_table[i].action)
@@ -938,8 +938,8 @@ xdnd_set_actions (GdkX11Drag *drag_x11)
 {
   GdkDrag *drag = GDK_DRAG (drag_x11);
   Atom *atomlist;
-  gint i;
-  gint n_atoms;
+  int i;
+  int n_atoms;
   guint actions;
   GdkDisplay *display = gdk_drag_get_display (drag);
 
@@ -1143,8 +1143,8 @@ xdnd_send_drop (GdkX11Drag *drag_x11,
 
 static void
 xdnd_send_motion (GdkX11Drag *drag_x11,
-                  gint               x_root,
-                  gint               y_root,
+                  int                x_root,
+                  int                y_root,
                   GdkDragAction      action,
                   guint32            time)
 {
@@ -1341,8 +1341,8 @@ drag_find_window_cache (GdkX11Drag *drag_x11,
 static Window
 gdk_x11_drag_find_surface (GdkDrag         *drag,
                            GdkSurface      *drag_surface,
-                           gint             x_root,
-                           gint             y_root,
+                           int              x_root,
+                           int              y_root,
                            GdkDragProtocol *protocol)
 {
   GdkX11Screen *screen_x11;
@@ -1406,8 +1406,8 @@ static gboolean
 gdk_x11_drag_drag_motion (GdkDrag *drag,
                                   Window          proxy_xid,
                                   GdkDragProtocol protocol,
-                                  gint            x_root,
-                                  gint            y_root,
+                                  int             x_root,
+                                  int             y_root,
                                   GdkDragAction   suggested_action,
                                   GdkDragAction   possible_actions,
                                   guint32         time)
@@ -1602,8 +1602,8 @@ gdk_x11_drag_get_drag_surface (GdkDrag *drag)
 
 static void
 gdk_x11_drag_set_hotspot (GdkDrag *drag,
-                                  gint            hot_x,
-                                  gint            hot_y)
+                                  int             hot_x,
+                                  int             hot_y)
 {
   GdkX11Drag *x11_drag = GDK_X11_DRAG (drag);
 
@@ -1874,7 +1874,7 @@ drag_grab (GdkDrag *drag)
   GdkDisplay *display;
   Window root;
   GdkSeat *seat;
-  gint keycode, i;
+  int keycode, i;
   GdkCursor *cursor;
 
   if (!x11_drag->ipc_surface)
@@ -1900,11 +1900,11 @@ drag_grab (GdkDrag *drag)
 
   for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i)
     {
-      gint deviceid = gdk_x11_device_get_id (gdk_seat_get_keyboard (seat));
+      int deviceid = gdk_x11_device_get_id (gdk_seat_get_keyboard (seat));
       unsigned char mask[XIMaskLen(XI_LASTEVENT)];
       XIGrabModifiers mods;
       XIEventMask evmask;
-      gint num_mods;
+      int num_mods;
 
       keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (display),
                                   grab_keys[i].keysym);
@@ -1946,7 +1946,7 @@ drag_ungrab (GdkDrag *drag)
   GdkDisplay *display;
   GdkDevice *keyboard;
   Window root;
-  gint keycode, i;
+  int keycode, i;
 
   if (!x11_drag->grab_seat)
     return;
@@ -1961,7 +1961,7 @@ drag_ungrab (GdkDrag *drag)
   for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i)
     {
       XIGrabModifiers mods;
-      gint num_mods;
+      int num_mods;
 
       keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (display),
                                   grab_keys[i].keysym);
@@ -2106,7 +2106,7 @@ gdk_x11_drag_drop_performed (GdkDrag *drag,
 
 static void
 gdk_drag_get_current_actions (GdkModifierType  state,
-                              gint             button,
+                              int              button,
                               GdkDragAction    actions,
                               GdkDragAction   *suggested_action,
                               GdkDragAction   *possible_actions)
@@ -2208,7 +2208,7 @@ gdk_dnd_handle_key_event (GdkDrag  *drag,
   GdkX11Drag *x11_drag = GDK_X11_DRAG (drag);
   GdkModifierType state;
   GdkDevice *pointer;
-  gint dx, dy;
+  int dx, dy;
 
   dx = dy = 0;
   state = gdk_event_get_modifier_state (event);
index 68535043c240c5189105ec84c7cf70201cf6d3ae..628ac33d0e6a2a4ddbedd2e6bfa133663645ffe6 100644 (file)
@@ -280,14 +280,14 @@ static struct {
     { "XdndActionPrivate", GDK_ACTION_COPY },
   };
 
-static const gint xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table);
+static const int xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table);
 
 static GdkDragAction
 xdnd_action_from_atom (GdkDisplay *display,
                        Atom        xatom)
 {
   const char *name;
-  gint i;
+  int i;
 
   if (xatom == None)
     return 0;
@@ -305,7 +305,7 @@ static Atom
 xdnd_action_to_atom (GdkDisplay    *display,
                      GdkDragAction  action)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < xdnd_n_actions; i++)
     if (action == xdnd_actions_table[i].action)
@@ -343,7 +343,7 @@ gdk_x11_drop_read_actions (GdkDrop *drop)
   gulong nitems, after;
   guchar *data;
   Atom *atoms;
-  gint i;
+  int i;
 
   drag = gdk_drop_get_drag (drop);
 
@@ -439,7 +439,7 @@ xdnd_enter_filter (GdkSurface   *surface,
   GdkX11Drop *drop_x11;
   GdkDrag *drag;
   GdkSeat *seat;
-  gint i;
+  int i;
   Atom type;
   int format;
   gulong nitems, after;
@@ -449,7 +449,7 @@ xdnd_enter_filter (GdkSurface   *surface,
   GPtrArray *formats;
   Window source_window;
   gboolean get_types;
-  gint version;
+  int version;
 
   source_window = xevent->xclient.data.l[0];
   get_types = ((xevent->xclient.data.l[1] & 1) != 0);
index ad0d6e05eeda8fd1c5264c0ca8953d33c176e152..a5d17e232ce6698a7e636cce290affd484d2c2b4 100644 (file)
@@ -27,7 +27,7 @@
 
 
 static gboolean gdk_event_source_prepare  (GSource     *source,
-                                           gint        *timeout);
+                                           int         *timeout);
 static gboolean gdk_event_source_check    (GSource     *source);
 static gboolean gdk_event_source_dispatch (GSource     *source,
                                            GSourceFunc  callback,
@@ -340,7 +340,7 @@ gdk_check_xpending (GdkDisplay *display)
 
 static gboolean
 gdk_event_source_prepare (GSource *source,
-                          gint    *timeout)
+                          int     *timeout)
 {
   GdkDisplay *display = ((GdkEventSource*) source)->display;
   gboolean retval;
@@ -488,7 +488,7 @@ gdk_x11_event_source_select_events (GdkEventSource *source,
 {
   unsigned int xmask = extra_x_mask;
   GList *list;
-  gint i;
+  int i;
 
   list = source->translators;
 
index 0bd475908f9d2bdbcdeac69ac6e2f6c0ed1037c6..d3f6d7df42f9491c17a27053ddf311f203e75a97 100644 (file)
@@ -1278,7 +1278,7 @@ get_cached_gl_visuals (GdkDisplay *display, int *system, int *rgba)
 {
   gboolean found;
   Atom type_return;
-  gint format_return;
+  int format_return;
   gulong nitems_return;
   gulong bytes_after_return;
   guchar *data = NULL;
@@ -1521,8 +1521,8 @@ gdk_x11_display_make_gl_context_current (GdkDisplay   *display,
  */
 gboolean
 gdk_x11_display_get_glx_version (GdkDisplay *display,
-                                 gint       *major,
-                                 gint       *minor)
+                                 int        *major,
+                                 int        *minor)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
 
index 11ee46a4d21e5372ac48c7c0390de6c6614b3106..dc4cd45e3cfc8534e724661c92d3ea0901c0d19c 100644 (file)
@@ -63,10 +63,10 @@ struct _GdkX11Keymap
 {
   GdkKeymap     parent_instance;
 
-  gint min_keycode;
-  gint max_keycode;
+  int min_keycode;
+  int max_keycode;
   KeySym* keymap;
-  gint keysyms_per_keycode;
+  int keysyms_per_keycode;
   XModifierKeymap* mod_keymap;
   guint lock_keysym;
   GdkModifierType group_switch_mask;
@@ -176,7 +176,7 @@ update_modmap (Display      *display,
     { NULL, 0, 0 }
   };
 
-  gint i, j, k;
+  int i, j, k;
 
   if (!vmods[0].atom)
     for (i = 0; vmods[i].name; i++)
@@ -254,17 +254,17 @@ get_xkb (GdkX11Keymap *keymap_x11)
  * otherwise we lose a whole group of keys
  */
 #define KEYSYM_INDEX(keymap_impl, group, level) \
-  (2 * ((group) % (gint)((keymap_impl->keysyms_per_keycode + 1) / 2)) + (level))
+  (2 * ((group) % (int)((keymap_impl->keysyms_per_keycode + 1) / 2)) + (level))
 #define KEYSYM_IS_KEYPAD(s) (((s) >= 0xff80 && (s) <= 0xffbd) || \
                              ((s) >= 0x11000000 && (s) <= 0x1100ffff))
 
-static gint
+static int
 get_symbol (const KeySym *syms,
             GdkX11Keymap *keymap_x11,
-            gint          group,
-            gint          level)
+            int           group,
+            int           level)
 {
-  gint index;
+  int index;
 
   index = KEYSYM_INDEX(keymap_x11, group, level);
   if (index >= keymap_x11->keysyms_per_keycode)
@@ -276,11 +276,11 @@ get_symbol (const KeySym *syms,
 static void
 set_symbol (KeySym       *syms,
             GdkX11Keymap *keymap_x11,
-            gint          group,
-            gint          level,
+            int           group,
+            int           level,
             KeySym        sym)
 {
-  gint index;
+  int index;
 
   index = KEYSYM_INDEX(keymap_x11, group, level);
   if (index >= keymap_x11->keysyms_per_keycode)
@@ -302,9 +302,9 @@ update_keymaps (GdkX11Keymap *keymap_x11)
   if (keymap_x11->keymap == NULL ||
       keymap_x11->current_serial != display_x11->keymap_serial)
     {
-      gint i;
-      gint map_size;
-      gint keycode;
+      int i;
+      int map_size;
+      int keycode;
 
       keymap_x11->current_serial = display_x11->keymap_serial;
 
@@ -374,8 +374,8 @@ update_keymaps (GdkX11Keymap *keymap_x11)
       for (i = 0; i < map_size; i++)
         {
           /* Get the key code at this point in the map. */
-          gint code = keymap_x11->mod_keymap->modifiermap[i];
-          gint j;
+          int code = keymap_x11->mod_keymap->modifiermap[i];
+          int j;
           KeySym *syms;
           guint mask;
 
@@ -472,15 +472,15 @@ get_keymap (GdkX11Keymap *keymap_x11)
 #ifdef HAVE_XKB
 static PangoDirection
 get_direction (XkbDescRec *xkb,
-               gint        group)
+               int         group)
 {
-  gint code;
+  int code;
 
-  gint rtl_minus_ltr = 0; /* total number of RTL keysyms minus LTR ones */
+  int rtl_minus_ltr = 0; /* total number of RTL keysyms minus LTR ones */
 
   for (code = xkb->min_key_code; code <= xkb->max_key_code; code++)
     {
-      gint level = 0;
+      int level = 0;
       KeySym sym = XkbKeySymEntry (xkb, code, level, group);
       PangoDirection dir = gdk_unichar_direction (gdk_keyval_to_unicode (sym));
 
@@ -511,7 +511,7 @@ get_direction (XkbDescRec *xkb,
 static PangoDirection
 get_direction_from_cache (GdkX11Keymap *keymap_x11,
                           XkbDescPtr    xkb,
-                          gint          group)
+                          int           group)
 {
   Atom group_atom = xkb->names->groups[group];
 
@@ -519,7 +519,7 @@ get_direction_from_cache (GdkX11Keymap *keymap_x11,
   DirectionCacheEntry *cache = keymap_x11->group_direction_cache;
 
   PangoDirection direction = PANGO_DIRECTION_NEUTRAL;
-  gint i;
+  int i;
 
   if (keymap_x11->have_direction)
     {
@@ -550,7 +550,7 @@ get_direction_from_cache (GdkX11Keymap *keymap_x11,
   /* insert in cache */
   if (!cache_hit)
     {
-      gint oldest = 0;
+      int oldest = 0;
 
       direction = get_direction (xkb, group);
 
@@ -583,7 +583,7 @@ get_num_groups (GdkKeymap *keymap,
 static gboolean
 update_direction (GdkX11Keymap *keymap_x11,
                   GdkDevice    *keyboard,
-                  gint          group)
+                  int           group)
 {
   XkbDescPtr xkb = get_xkb (keymap_x11);
   Atom group_atom;
@@ -615,8 +615,8 @@ update_direction (GdkX11Keymap *keymap_x11,
 static gboolean
 update_lock_state (GdkX11Keymap *keymap_x11,
                    GdkDevice    *keyboard,
-                   gint          locked_mods,
-                   gint          effective_mods)
+                   int           locked_mods,
+                   int           effective_mods)
 {
   XkbDescPtr xkb G_GNUC_UNUSED;
   gboolean have_lock_state;
@@ -832,17 +832,17 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap *keymap,
       /* See sec 15.3.4 in XKB docs */
 
       XkbDescRec *xkb = get_xkb (keymap_x11);
-      gint keycode;
+      int keycode;
 
       keycode = keymap_x11->min_keycode;
 
       while (keycode <= keymap_x11->max_keycode)
         {
-          gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode); /* "key width" */
-          gint group = 0;
-          gint level = 0;
-          gint total_syms = XkbKeyNumSyms (xkb, keycode);
-          gint i = 0;
+          int max_shift_levels = XkbKeyGroupsWidth (xkb, keycode); /* "key width" */
+          int group = 0;
+          int level = 0;
+          int total_syms = XkbKeyNumSyms (xkb, keycode);
+          int i = 0;
           KeySym *entry;
 
           /* entry is an array with all syms for group 0, all
@@ -888,13 +888,13 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap *keymap,
 #endif
     {
       const KeySym *map = get_keymap (keymap_x11);
-      gint keycode;
+      int keycode;
 
       keycode = keymap_x11->min_keycode;
       while (keycode <= keymap_x11->max_keycode)
         {
           const KeySym *syms = map + (keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
-          gint i = 0;
+          int i = 0;
 
           while (i < keymap_x11->keysyms_per_keycode)
             {
@@ -927,7 +927,7 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
                                         guint          hardware_keycode,
                                         GdkKeymapKey **keys,
                                         guint        **keyvals,
-                                        gint          *n_entries)
+                                        int           *n_entries)
 {
   GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
   GArray *key_array;
@@ -963,11 +963,11 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
       /* See sec 15.3.4 in XKB docs */
 
       XkbDescRec *xkb = get_xkb (keymap_x11);
-      gint max_shift_levels;
-      gint group = 0;
-      gint level = 0;
-      gint total_syms;
-      gint i = 0;
+      int max_shift_levels;
+      int group = 0;
+      int level = 0;
+      int total_syms;
+      int i = 0;
       KeySym *entry;
 
       max_shift_levels = XkbKeyGroupsWidth (xkb, hardware_keycode); /* "key width" */
@@ -1014,7 +1014,7 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap     *keymap,
     {
       const KeySym *map = get_keymap (keymap_x11);
       const KeySym *syms;
-      gint i = 0;
+      int i = 0;
 
       syms = map + (hardware_keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
 
@@ -1230,10 +1230,10 @@ MyEnhancedXkbTranslateKeyCode(register XkbDescPtr     xkb,
 static guint
 translate_keysym (GdkX11Keymap   *keymap_x11,
                   guint           hardware_keycode,
-                  gint            group,
+                  int             group,
                   GdkModifierType state,
-                  gint           *effective_group,
-                  gint           *effective_level)
+                  int            *effective_group,
+                  int            *effective_level)
 {
   const KeySym *map = get_keymap (keymap_x11);
   const KeySym *syms = map + (hardware_keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode;
@@ -1241,7 +1241,7 @@ translate_keysym (GdkX11Keymap   *keymap_x11,
 #define SYM(k,g,l) get_symbol (syms, k,g,l)
 
   GdkModifierType shift_modifiers;
-  gint shift_level;
+  int shift_level;
   guint tmp_keyval;
 
   shift_modifiers = GDK_SHIFT_MASK;
@@ -1299,10 +1299,10 @@ static gboolean
 gdk_x11_keymap_translate_keyboard_state (GdkKeymap       *keymap,
                                          guint            hardware_keycode,
                                          GdkModifierType  state,
-                                         gint             group,
+                                         int              group,
                                          guint           *keyval,
-                                         gint            *effective_group,
-                                         gint            *level,
+                                         int             *effective_group,
+                                         int             *level,
                                          GdkModifierType *consumed_modifiers)
 {
   GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
@@ -1406,7 +1406,7 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap       *keymap,
  *
  * Returns: the index of the active keyboard group for the event
  */
-gint
+int
 gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,
                                     guint      state)
 {
@@ -1478,7 +1478,7 @@ gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
                                 guint      keycode)
 {
   GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap);
-  gint i;
+  int i;
 
   g_return_val_if_fail (GDK_IS_X11_KEYMAP (keymap), FALSE);
 
index e56be6edcaa3a41640346cea1c2db320432e6e9d..db53da0dccac0cc4854fb8ffe97f3bdf1fe54588 100644 (file)
@@ -39,7 +39,7 @@ typedef struct _GdkX11KeymapClass GdkX11KeymapClass;
 
 GType gdk_x11_keymap_get_type (void);
 
-gint gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap,
+int gdk_x11_keymap_get_group_for_state  (GdkKeymap *keymap,
                                          guint      state);
 
 gboolean gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap,
index 62cbf7b65445082f8ca2b0a1a287b385cbccb15b..4208ab881e525824856710423bc947f0a5b05c7a 100644 (file)
@@ -101,7 +101,7 @@ _gdk_x11_surfaceing_init (void)
 }
 
 GdkGrabStatus
-_gdk_x11_convert_grab_status (gint status)
+_gdk_x11_convert_grab_status (int status)
 {
   switch (status)
     {
@@ -323,7 +323,7 @@ _gdk_x11_error_handler_pop  (void)
     }
 }
 
-gint
+int
 _gdk_x11_display_send_xevent (GdkDisplay *display,
                               Window      window,
                               gboolean    propagate,
@@ -348,15 +348,15 @@ _gdk_x11_display_send_xevent (GdkDisplay *display,
 
 void
 _gdk_x11_region_get_xrectangles (const cairo_region_t *region,
-                                 gint             x_offset,
-                                 gint             y_offset,
-                                 gint             scale,
+                                 int              x_offset,
+                                 int              y_offset,
+                                 int              scale,
                                  XRectangle     **rects,
-                                 gint            *n_rects)
+                                 int             *n_rects)
 {
   XRectangle *rectangles;
   cairo_rectangle_int_t box;
-  gint i, n;
+  int i, n;
   
   n = cairo_region_num_rectangles (region);
   rectangles = g_new (XRectangle, n);
index 23540383cf77c72b9f6a8a1b932d2352e15ad072..eca7e4fcbd1e3551e101c78099a7294c16ab2eea 100644 (file)
@@ -56,7 +56,7 @@ void _gdk_x11_error_handler_push (void);
 void _gdk_x11_error_handler_pop  (void);
 
 void          gdk_display_setup_window_visual            (GdkDisplay     *display,
-                                                          gint            depth,
+                                                          int             depth,
                                                           Visual         *visual,
                                                           Colormap        colormap,
                                                           gboolean        rgba);
@@ -70,23 +70,23 @@ void _gdk_x11_display_add_window    (GdkDisplay *display,
 void _gdk_x11_display_remove_window (GdkDisplay *display,
                                      XID         xid);
 
-gint _gdk_x11_display_send_xevent (GdkDisplay *display,
-                                   Window      window,
-                                   gboolean    propagate,
-                                   glong       event_mask,
-                                   XEvent     *event_send);
+int _gdk_x11_display_send_xevent (GdkDisplay *display,
+                                  Window      window,
+                                  gboolean    propagate,
+                                  glong       event_mask,
+                                  XEvent     *event_send);
 
 cairo_region_t* _gdk_x11_xwindow_get_shape  (Display *xdisplay,
                                              Window   window,
-                                             gint     scale,
-                                             gint     shape_type);
+                                             int      scale,
+                                             int      shape_type);
 
 void     _gdk_x11_region_get_xrectangles   (const cairo_region_t  *region,
-                                            gint                   x_offset,
-                                            gint                   y_offset,
-                                            gint                   scale,
+                                            int                    x_offset,
+                                            int                    y_offset,
+                                            int                    scale,
                                             XRectangle           **rects,
-                                            gint                  *n_rects);
+                                            int                   *n_rects);
 
 gboolean _gdk_x11_moveresize_handle_event   (const XEvent *event);
 gboolean _gdk_x11_moveresize_configure_done (GdkDisplay *display,
@@ -114,7 +114,7 @@ gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
 
 void _gdk_x11_display_update_grab_info        (GdkDisplay *display,
                                                GdkDevice  *device,
-                                               gint        status);
+                                               int         status);
 void _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display,
                                                GdkDevice  *device,
                                                guint32     time,
@@ -124,11 +124,11 @@ void _gdk_x11_display_queue_events            (GdkDisplay *display);
 
 GdkAppLaunchContext *_gdk_x11_display_get_app_launch_context (GdkDisplay *display);
 
-gint        _gdk_x11_display_text_property_to_utf8_list (GdkDisplay     *display,
+int         _gdk_x11_display_text_property_to_utf8_list (GdkDisplay     *display,
                                                          const char     *encoding,
-                                                         gint            format,
+                                                         int             format,
                                                          const guchar   *text,
-                                                         gint            length,
+                                                         int             length,
                                                          gchar        ***list);
 char *      gdk_x11_utf8_to_string_target               (const char     *utf8_str,
                                                          gboolean        return_latin1);
@@ -139,16 +139,16 @@ GdkX11DeviceManagerXI2 *_gdk_x11_device_manager_new (GdkDisplay *display);
 
 guchar * _gdk_x11_device_xi2_translate_event_mask (GdkX11DeviceManagerXI2 *device_manager_xi2,
                                                    GdkEventMask            event_mask,
-                                                   gint                   *len);
+                                                   int                    *len);
 guint    _gdk_x11_device_xi2_translate_state      (XIModifierState *mods_state,
                                                    XIButtonState   *buttons_state,
                                                    XIGroupState    *group_state);
-gint     _gdk_x11_device_xi2_get_id               (GdkX11DeviceXI2 *device);
+int      _gdk_x11_device_xi2_get_id               (GdkX11DeviceXI2 *device);
 void     _gdk_device_xi2_unset_scroll_valuators   (GdkX11DeviceXI2 *device);
 
 
 GdkDevice * _gdk_x11_device_manager_xi2_lookup    (GdkX11DeviceManagerXI2 *device_manager_xi2,
-                                                   gint                    device_id);
+                                                   int                     device_id);
 void     _gdk_x11_device_xi2_add_scroll_valuator  (GdkX11DeviceXI2    *device,
                                                    guint               n_valuator,
                                                    GdkScrollDirection  direction,
@@ -161,11 +161,11 @@ gboolean  _gdk_x11_device_xi2_get_scroll_delta    (GdkX11DeviceXI2    *device,
 void     _gdk_device_xi2_reset_scroll_valuators   (GdkX11DeviceXI2    *device);
 
 gdouble  gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device,
-                                                 gint             n_axis);
+                                                 int              n_axis);
 
 void     gdk_x11_device_xi2_store_axes          (GdkX11DeviceXI2 *device,
                                                  gdouble         *axes,
-                                                 gint             n_axes);
+                                                 int              n_axes);
 
 gboolean   _gdk_x11_display_supports_cursor_alpha   (GdkDisplay    *display);
 gboolean   _gdk_x11_display_supports_cursor_color   (GdkDisplay    *display);
@@ -187,7 +187,7 @@ GList *    gdk_x11_display_get_toplevel_windows     (GdkDisplay *display);
 
 void _gdk_x11_precache_atoms (GdkDisplay          *display,
                               const gchar * const *atom_names,
-                              gint                 n_atoms);
+                              int                  n_atoms);
 
 Atom _gdk_x11_get_xatom_for_display_printf         (GdkDisplay    *display,
                                                     const gchar   *format,
@@ -232,10 +232,10 @@ GdkDrag        * _gdk_x11_surface_drag_begin (GdkSurface          *window,
                                               double              dy);
 
 void gdk_x11_surface_get_root_coords (GdkSurface *surface,
-                                      gint        x,
-                                      gint        y,
-                                      gint       *root_x,
-                                      gint       *root_y);
+                                      int         x,
+                                      int         y,
+                                      int        *root_x,
+                                      int        *root_y);
 
 void gdk_x11_surface_show (GdkSurface *surface,
                            gboolean    already_mapped);
@@ -244,14 +244,14 @@ void gdk_x11_surface_set_opacity (GdkSurface *surface,
                                   double      opacity);
 gboolean gdk_x11_surface_supports_edge_constraints (GdkSurface *surface);
 
-GdkGrabStatus _gdk_x11_convert_grab_status (gint status);
+GdkGrabStatus _gdk_x11_convert_grab_status (int status);
 
 cairo_surface_t * _gdk_x11_display_create_bitmap_surface (GdkDisplay *display,
                                                           int         width,
                                                           int         height);
 
-extern const gint        _gdk_x11_event_mask_table[];
-extern const gint        _gdk_x11_event_mask_table_size;
+extern const int         _gdk_x11_event_mask_table[];
+extern const int         _gdk_x11_event_mask_table_size;
 
 #define GDK_SCREEN_DISPLAY(screen)    (GDK_X11_SCREEN (screen)->display)
 #define GDK_SCREEN_XROOTWIN(screen)   (GDK_X11_SCREEN (screen)->xroot_window)
index 4755d895a525a4cdb571ed831a8a0224074132a9..fd6ddca2fb7379384a88deffb16dc546333c689c 100644 (file)
@@ -103,12 +103,12 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay  *display,
 void
 _gdk_x11_precache_atoms (GdkDisplay          *display,
                         const gchar * const *atom_names,
-                        gint                 n_atoms)
+                        int                  n_atoms)
 {
   Atom *xatoms;
   const char **xatom_names;
-  gint n_xatoms;
-  gint i;
+  int n_xatoms;
+  int i;
 
   xatoms = g_new (Atom, n_atoms);
   xatom_names = g_new (const char *, n_atoms);
index 6f1aa1f9c82e3eff4f9c5645e69cc1cdd46a5dfe..8b875dfc5891ec0473f6dcad97a24f4d9b944971 100644 (file)
@@ -106,7 +106,7 @@ static void
 gdk_x11_screen_finalize (GObject *object)
 {
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (object);
-  gint          i;
+  int           i;
 
   /* Visual Part */
   for (i = 0; i < x11_screen->nvisuals; i++)
@@ -131,7 +131,7 @@ gdk_x11_screen_finalize (GObject *object)
  */
 XID
 gdk_x11_screen_get_monitor_output (GdkX11Screen *x11_screen,
-                                   gint          monitor_num)
+                                   int           monitor_num)
 {
   GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display);
   GdkX11Monitor *monitor;
@@ -874,7 +874,7 @@ init_multihead (GdkX11Screen *screen)
 
 GdkX11Screen *
 _gdk_x11_screen_new (GdkDisplay *display,
-                    gint        screen_number,
+                    int         screen_number,
                      gboolean    setup_display)
 {
   GdkX11Screen *x11_screen;
@@ -913,7 +913,7 @@ _gdk_x11_screen_new (GdkDisplay *display,
 
 void
 _gdk_x11_screen_set_surface_scale (GdkX11Screen *x11_screen,
-                                 gint          scale)
+                                 int           scale)
 {
   GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display);
   GList *toplevels, *l;
@@ -995,17 +995,17 @@ _gdk_x11_screen_size_changed (GdkX11Screen *screen,
 
 void
 _gdk_x11_screen_get_edge_monitors (GdkX11Screen *x11_screen,
-                                   gint      *top,
-                                   gint      *bottom,
-                                   gint      *left,
-                                   gint      *right)
+                                   int       *top,
+                                   int       *bottom,
+                                   int       *left,
+                                   int       *right)
 {
 #ifdef HAVE_XFREE_XINERAMA
-  gint          top_most_pos = HeightOfScreen (x11_screen->xscreen);
-  gint          left_most_pos = WidthOfScreen (x11_screen->xscreen);
-  gint          bottom_most_pos = 0;
-  gint          right_most_pos = 0;
-  gint          i;
+  int           top_most_pos = HeightOfScreen (x11_screen->xscreen);
+  int           left_most_pos = WidthOfScreen (x11_screen->xscreen);
+  int           bottom_most_pos = 0;
+  int           right_most_pos = 0;
+  int           i;
   XineramaScreenInfo *x_monitors;
   int x_n_monitors;
 #endif
@@ -1102,7 +1102,7 @@ get_net_supporting_wm_check (GdkX11Screen *screen,
 {
   GdkDisplay *display;
   Atom type;
-  gint format;
+  int format;
   gulong n_items;
   gulong bytes_after;
   guchar *data;
@@ -1135,7 +1135,7 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
   GdkDisplay *display;
   Window window;
   GTimeVal tv;
-  gint error;
+  int error;
 
   display = x11_screen->display;
 
@@ -1234,7 +1234,7 @@ gdk_x11_screen_supports_net_wm_hint (GdkX11Screen *x11_screen,
        * refetch it.
        */
       Atom type;
-      gint format;
+      int format;
       gulong bytes_after;
 
       x11_screen->need_refetch_net_supported = FALSE;
@@ -1302,7 +1302,7 @@ gdk_x11_screen_get_window_manager_name (GdkX11Screen *x11_screen)
       if (x11_screen->wmspec_check_window != None)
         {
           Atom type;
-          gint format;
+          int format;
           gulong n_items;
           gulong bytes_after;
           gchar *name;
@@ -1361,7 +1361,7 @@ get_netwm_cardinal_property (GdkX11Screen *x11_screen,
 {
   guint32 prop = 0;
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   guchar *data;
index 61a4ef19473535d5ff2764e7dc30797272c92c3d..0d7bead87e74340b2dfa8926c99e92ea65cacb34 100644 (file)
@@ -37,17 +37,17 @@ struct _GdkX11Screen
   Display *xdisplay;
   Screen *xscreen;
   Window xroot_window;
-  gint screen_num;
+  int screen_num;
 
-  gint surface_scale;
+  int surface_scale;
   gboolean fixed_surface_scale;
 
   /* Xft resources for the display, used for default values for
    * the Xft/ XSETTINGS
    */
-  gint xft_hintstyle;
-  gint xft_rgba;
-  gint xft_dpi;
+  int xft_hintstyle;
+  int xft_rgba;
+  int xft_dpi;
 
   /* Window manager */
   long last_wmspec_check_time;
@@ -72,10 +72,10 @@ struct _GdkX11Screen
   guint xft_hinting : 1;
 
   /* Visual Part */
-  gint nvisuals;
+  int nvisuals;
   GdkX11Visual **visuals;
   GdkX11Visual *system_visual;
-  gint available_depths[7];
+  int available_depths[7];
   GdkVisualType available_types[6];
   gint16 navailable_depths;
   gint16 navailable_types;
@@ -94,7 +94,7 @@ struct _GdkX11ScreenClass
 
 GType       _gdk_x11_screen_get_type (void);
 GdkX11Screen *_gdk_x11_screen_new           (GdkDisplay   *display,
-                                             gint          screen_number,
+                                             int           screen_number,
                                              gboolean      setup_display);
 
 void _gdk_x11_screen_update_visuals_for_gl  (GdkX11Screen *screen);
@@ -102,10 +102,10 @@ void _gdk_x11_screen_window_manager_changed (GdkX11Screen *screen);
 void _gdk_x11_screen_size_changed           (GdkX11Screen *screen,
                                              const XEvent *event);
 void _gdk_x11_screen_get_edge_monitors      (GdkX11Screen *screen,
-                                             gint         *top,
-                                             gint         *bottom,
-                                             gint         *left,
-                                             gint         *right);
+                                             int          *top,
+                                             int          *bottom,
+                                             int          *left,
+                                             int          *right);
 void _gdk_x11_screen_set_surface_scale      (GdkX11Screen *x11_screen,
                                              int           scale);
 gboolean _gdk_x11_screen_get_monitor_work_area (GdkX11Screen *screen,
index 544d0875dcb8b8438bf2aa11113bf52607f7cfe0..83cdd8c37a9a757a5b594e4de2ca8198ae55f8be 100644 (file)
  * Returns: the number of strings stored in list, or 0,
  *     if the conversion failed
  */
-gint
+int
 gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
                                             const char   *encoding,
-                                            gint          format,
+                                            int           format,
                                             const guchar *text,
-                                            gint          length,
+                                            int           length,
                                             gchar      ***list)
 {
   XTextProperty property;
-  gint count = 0;
-  gint res;
+  int count = 0;
+  int res;
   gchar **local_list;
   g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
 
@@ -108,15 +108,15 @@ gdk_x11_free_text_list (gchar **list)
   XFreeStringList (list);
 }
 
-static gint
+static int
 make_list (const gchar  *text,
-           gint          length,
+           int           length,
            gboolean      latin1,
            gchar      ***list)
 {
   GSList *strings = NULL;
-  gint n_strings = 0;
-  gint i;
+  int n_strings = 0;
+  int i;
   const gchar *p = text;
   const gchar *q;
   GSList *tmp_list;
@@ -186,12 +186,12 @@ make_list (const gchar  *text,
   return n_strings;
 }
 
-gint
+int
 _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
                                              const char    *encoding,
-                                             gint           format,
+                                             int            format,
                                              const guchar  *text,
-                                             gint           length,
+                                             int            length,
                                              gchar       ***list)
 {
   if (g_str_equal (encoding, "STRING"))
@@ -205,11 +205,11 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
   else
     {
       gchar **local_list;
-      gint local_count;
-      gint i;
+      int local_count;
+      int i;
       const gchar *charset = NULL;
       gboolean need_conversion = !g_get_charset (&charset);
-      gint count = 0;
+      int count = 0;
       GError *error = NULL;
 
       /* Probably COMPOUND text, we fall back to Xlib routines
@@ -285,15 +285,15 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay    *display,
  *
  * Returns: 0 upon success, non-zero upon failure
  */
-gint
+int
 gdk_x11_display_string_to_compound_text (GdkDisplay  *display,
                                          const char  *str,
                                          const char **encoding,
-                                         gint        *format,
+                                         int         *format,
                                          guchar     **ctext,
-                                         gint        *length)
+                                         int         *length)
 {
-  gint res;
+  int res;
   XTextProperty property;
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), 0);
@@ -343,9 +343,9 @@ gboolean
 gdk_x11_display_utf8_to_compound_text (GdkDisplay  *display,
                                        const char  *str,
                                        const char **encoding,
-                                       gint        *format,
+                                       int         *format,
                                        guchar     **ctext,
-                                       gint        *length)
+                                       int         *length)
 {
   gboolean need_conversion;
   const gchar *charset;
index 99778c236dc935bd324977ac35c7b769b20757aa..6e10867abd95032cdfbb1d55467ce897fbf312ed 100644 (file)
@@ -325,12 +325,12 @@ get_selection_property (Display  *display,
                         Window    owner,
                         Atom      property,
                         Atom     *ret_type,
-                        gint     *ret_format)
+                        int      *ret_format)
 {
   gulong nitems;
   gulong nbytes;
   Atom prop_type;
-  gint prop_format;
+  int prop_format;
   guchar *data = NULL;
 
   if (XGetWindowProperty (display, owner, property,
@@ -390,7 +390,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay   *display,
   Window xwindow;
   GBytes *bytes;
   Atom type;
-  gint format;
+  int format;
 
   xdisplay = gdk_x11_display_get_xdisplay (priv->display);
   xwindow = GDK_X11_DISPLAY (priv->display)->leader_window;
index bdd4c57d087f50819272ac17641edcfccbf72938..b9aad4c3f399b6bcbd0edfcde9d0a7d78cf805a1 100644 (file)
@@ -846,7 +846,7 @@ static const struct {
   const char *x_target;
   const char *mime_type;
   const char *type;
-  gint format;
+  int format;
   MimeTypeHandleFunc handler;
 } special_targets[] = {
   { "UTF8_STRING",   "text/plain;charset=utf-8", "UTF8_STRING",   8,  handle_utf8 },
@@ -901,7 +901,7 @@ gdk_x11_selection_output_streams_request (GdkDisplay                   *display,
       gulong n_atoms;
       gulong nbytes;
       Atom prop_type;
-      gint prop_format;
+      int prop_format;
       Atom *atoms = NULL;
       int error;
 
index 2567d7e765c606f6fc4135686492dbe165944bd4..ec0c6d582a1c04330d1ac4bac56ed20bda2cb8f8 100644 (file)
@@ -96,7 +96,7 @@ const int _gdk_x11_event_mask_table[21] =
   ButtonPressMask      /* SCROLL; on X mouse wheel events is treated as mouse button 4/5 */
 };
 
-const gint _gdk_x11_event_mask_table_size = G_N_ELEMENTS (_gdk_x11_event_mask_table);
+const int _gdk_x11_event_mask_table_size = G_N_ELEMENTS (_gdk_x11_event_mask_table);
 
 /* Forward declarations */
 static void     gdk_x11_surface_apply_fullscreen_mode (GdkSurface  *surface);
@@ -1197,7 +1197,7 @@ set_initial_hints (GdkSurface *surface)
   Window xwindow = GDK_SURFACE_XID (surface);  
   GdkToplevelX11 *toplevel;
   Atom atoms[9];
-  gint i;
+  int i;
 
   toplevel = _gdk_x11_surface_get_toplevel (surface);
 
@@ -1379,8 +1379,8 @@ gdk_x11_surface_hide (GdkSurface *surface)
 
 static inline void
 x11_surface_move (GdkSurface *surface,
-                  gint        x,
-                  gint        y)
+                  int         x,
+                  int         y)
 {
   GdkX11Surface *impl = GDK_X11_SURFACE (surface);
 
@@ -1408,8 +1408,8 @@ x11_surface_move (GdkSurface *surface,
 
 static inline void
 x11_surface_resize (GdkSurface *surface,
-                   gint       width,
-                   gint       height)
+                   int        width,
+                   int        height)
 {
   GdkX11Surface *impl = GDK_X11_SURFACE (surface);
 
@@ -1443,10 +1443,10 @@ x11_surface_resize (GdkSurface *surface,
 
 static inline void
 x11_surface_move_resize (GdkSurface *surface,
-                         gint        x,
-                         gint        y,
-                         gint        width,
-                         gint        height)
+                         int         x,
+                         int         y,
+                         int         width,
+                         int         height)
 {
   GdkX11Surface *impl = GDK_X11_SURFACE (surface);
 
@@ -1496,10 +1496,10 @@ x11_surface_move_resize (GdkSurface *surface,
 static void
 gdk_x11_surface_move_resize (GdkSurface *surface,
                              gboolean    with_move,
-                             gint        x,
-                             gint        y,
-                             gint        width,
-                             gint        height)
+                             int         x,
+                             int         y,
+                             int         width,
+                             int         height)
 {
   if (with_move && (width < 0 && height < 0))
     x11_surface_move (surface, x, y);
@@ -1514,16 +1514,16 @@ gdk_x11_surface_move_resize (GdkSurface *surface,
 
 static void
 gdk_x11_surface_toplevel_resize (GdkSurface *surface,
-                                 gint        width,
-                                 gint        height)
+                                 int         width,
+                                 int         height)
 {
   x11_surface_resize (surface, width, height);
 }
 
 void
 gdk_x11_surface_move (GdkSurface *surface,
-                      gint        x,
-                      gint        y)
+                      int         x,
+                      int         y)
 {
   gdk_x11_surface_move_resize (surface, TRUE, x, y, -1, -1);
 }
@@ -1804,7 +1804,7 @@ get_netwm_cardinal_property (GdkSurface   *surface,
   GdkX11Screen *x11_screen = GDK_SURFACE_SCREEN (surface);
   guint32 prop = 0;
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   guchar *data;
@@ -2334,8 +2334,8 @@ set_text_property (GdkDisplay  *display,
 {
   gchar *prop_text = NULL;
   Atom prop_type;
-  gint prop_length;
-  gint prop_format;
+  int prop_length;
+  int prop_format;
   gboolean is_compound_text;
   
   if (utf8_is_latin1 (utf8_str))
@@ -2483,15 +2483,15 @@ _gdk_x11_surface_get_cursor (GdkSurface *surface)
 
 static void
 gdk_x11_surface_get_geometry (GdkSurface *surface,
-                             gint      *x,
-                             gint      *y,
-                             gint      *width,
-                             gint      *height)
+                             int       *x,
+                             int       *y,
+                             int       *width,
+                             int       *height)
 {
   GdkX11Surface *impl;
   Window root;
-  gint tx;
-  gint ty;
+  int tx;
+  int ty;
   guint twidth;
   guint theight;
   guint tborder_width;
@@ -2518,15 +2518,15 @@ gdk_x11_surface_get_geometry (GdkSurface *surface,
 
 void
 gdk_x11_surface_get_root_coords (GdkSurface *surface,
-                               gint       x,
-                               gint       y,
-                               gint      *root_x,
-                               gint      *root_y)
+                               int        x,
+                               int        y,
+                               int       *root_x,
+                               int       *root_y)
 {
   GdkX11Surface *impl = GDK_X11_SURFACE (surface);
   Window child;
-  gint tx;
-  gint ty;
+  int tx;
+  int ty;
   
   XTranslateCoordinates (GDK_SURFACE_XDISPLAY (surface),
                          GDK_SURFACE_XID (surface),
@@ -2558,10 +2558,10 @@ gdk_x11_surface_get_frame_extents (GdkSurface    *surface,
   guint nvroots;
   gulong nitems_return;
   gulong bytes_after_return;
-  gint format_return;
-  gint i;
+  int format_return;
+  int i;
   guint ww, wh, wb, wd;
-  gint wx, wy;
+  int wx, wy;
   gboolean got_frame_extents = FALSE;
 
   g_return_if_fail (rect != NULL);
@@ -2752,7 +2752,7 @@ gdk_x11_surface_set_input_region (GdkSurface     *surface,
     }
   else
     {
-      gint n_rects = 0;
+      int n_rects = 0;
       XRectangle *xrects = NULL;
 
       _gdk_x11_region_get_xrectangles (input_region,
@@ -3032,12 +3032,12 @@ gdk_x11_surface_set_icon_list (GdkSurface *surface,
 {
   gulong *data;
   gulong *p;
-  gint size;
+  int size;
   GList *l;
-  gint width, height;
+  int width, height;
   GdkTexture *texture;
   GdkDisplay *display;
-  gint i, n;
+  int i, n;
 
   if (GDK_SURFACE_DESTROYED (surface))
     return;
@@ -3206,8 +3206,8 @@ gdk_x11_surface_apply_fullscreen_mode (GdkSurface *surface)
   if (GDK_SURFACE_IS_MAPPED (surface))
     {
       XClientMessageEvent xclient;
-      gint                monitors[4];
-      gint                i;
+      int                 monitors[4];
+      int                 i;
 
       memset (&xclient, 0, sizeof (xclient));
       xclient.type = ClientMessage;
@@ -3404,7 +3404,7 @@ gdk_surface_get_mwm_hints (GdkSurface *surface)
   Atom hints_atom = None;
   guchar *data;
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   
@@ -3435,7 +3435,7 @@ gdk_surface_set_mwm_hints (GdkSurface *surface,
   guchar *data;
   MotifWmHints *hints;
   Atom type;
-  gint format;
+  int format;
   gulong nitems;
   gulong bytes_after;
   
@@ -3591,13 +3591,13 @@ gdk_x11_surface_get_functions (GdkSurface       *surface,
 cairo_region_t *
 _gdk_x11_xwindow_get_shape (Display *xdisplay,
                             Window   window,
-                            gint     scale,
-                            gint     shape_type)
+                            int      scale,
+                            int      shape_type)
 {
   cairo_region_t *shape;
   GdkRectangle *rl;
   XRectangle *xrl;
-  gint rn, ord, i;
+  int rn, ord, i;
 
   shape = NULL;
   rn = 0;
@@ -3660,10 +3660,10 @@ _gdk_x11_xwindow_get_shape (Display *xdisplay,
 static void
 wmspec_send_message (GdkDisplay *display,
                      GdkSurface  *surface,
-                     gint        root_x,
-                     gint        root_y,
-                     gint        action,
-                     gint        button)
+                     int         root_x,
+                     int         root_y,
+                     int         action,
+                     int         button)
 {
   GdkX11Surface *impl = GDK_X11_SURFACE (surface);
   XClientMessageEvent xclient;
@@ -3716,11 +3716,11 @@ handle_wmspec_button_release (GdkDisplay   *display,
 
 static void
 wmspec_moveresize (GdkSurface *surface,
-                   gint       direction,
+                   int        direction,
                    GdkDevice *device,
-                   gint       button,
-                   gint       root_x,
-                   gint       root_y,
+                   int        button,
+                   int        root_x,
+                   int        root_y,
                    guint32    timestamp)
 {
   GdkDisplay *display = GDK_SURFACE_DISPLAY (surface);
@@ -3736,12 +3736,12 @@ static void
 wmspec_resize_drag (GdkSurface     *surface,
                     GdkSurfaceEdge  edge,
                     GdkDevice     *device,
-                    gint           button,
-                    gint           root_x,
-                    gint           root_y,
+                    int            button,
+                    int            root_x,
+                    int            root_y,
                     guint32        timestamp)
 {
-  gint direction;
+  int direction;
   
   if (button == 0)
     direction = _NET_WM_MOVERESIZE_SIZE_KEYBOARD;
@@ -3803,13 +3803,13 @@ struct _MoveResizeData
   gboolean is_resize;
   GdkSurfaceEdge resize_edge;
   GdkDevice *device;
-  gint moveresize_button;
-  gint moveresize_x;
-  gint moveresize_y;
-  gint moveresize_orig_x;
-  gint moveresize_orig_y;
-  gint moveresize_orig_width;
-  gint moveresize_orig_height;
+  int moveresize_button;
+  int moveresize_x;
+  int moveresize_y;
+  int moveresize_orig_x;
+  int moveresize_orig_y;
+  int moveresize_orig_width;
+  int moveresize_orig_height;
   GdkSurfaceHints moveresize_geom_mask;
   GdkGeometry moveresize_geometry;
   Time moveresize_process_time;
@@ -3845,7 +3845,7 @@ check_maximize (MoveResizeData *mv_resize,
                 gdouble         y_root)
 {
   GdkSurfaceState state;
-  gint y;
+  int y;
 
   if (mv_resize->is_resize)
     return;
@@ -3867,7 +3867,7 @@ check_unmaximize (MoveResizeData *mv_resize,
                   gdouble         y_root)
 {
   GdkSurfaceState state;
-  gint dx, dy;
+  int dx, dy;
 
   if (mv_resize->is_resize)
     return;
@@ -3886,10 +3886,10 @@ check_unmaximize (MoveResizeData *mv_resize,
 
 static void
 update_pos (MoveResizeData *mv_resize,
-           gint            new_root_x,
-           gint            new_root_y)
+           int             new_root_x,
+           int             new_root_y)
 {
-  gint dx, dy;
+  int dx, dy;
 
   check_unmaximize (mv_resize, new_root_x, new_root_y);
   dx = new_root_x - mv_resize->moveresize_x;
@@ -3897,7 +3897,7 @@ update_pos (MoveResizeData *mv_resize,
 
   if (mv_resize->is_resize)
     {
-      gint x, y, w, h;
+      int x, y, w, h;
 
       x = mv_resize->moveresize_orig_x;
       y = mv_resize->moveresize_orig_y;
@@ -3962,7 +3962,7 @@ update_pos (MoveResizeData *mv_resize,
     }
   else
     {
-      gint x, y;
+      int x, y;
 
       x = mv_resize->moveresize_orig_x + dx;
       y = mv_resize->moveresize_orig_y + dy;
@@ -4104,7 +4104,7 @@ _gdk_x11_moveresize_handle_event (const XEvent *event)
         /* we just assume this is an XI2 event */
         XIEvent *ev = (XIEvent *) event->xcookie.data;
         XIDeviceEvent *xev = (XIDeviceEvent *)ev;
-        gint state;
+        int state;
         switch (ev->evtype)
           {
           case XI_Motion:
@@ -4202,7 +4202,7 @@ static void
 calculate_unmoving_origin (MoveResizeData *mv_resize)
 {
   GdkRectangle rect;
-  gint width, height;
+  int width, height;
 
   if (mv_resize->moveresize_geom_mask & GDK_HINT_WIN_GRAVITY &&
       mv_resize->moveresize_geometry.win_gravity == GDK_GRAVITY_STATIC)
@@ -4268,9 +4268,9 @@ static void
 emulate_resize_drag (GdkSurface     *surface,
                      GdkSurfaceEdge  edge,
                      GdkDevice     *device,
-                     gint           button,
-                     gint           root_x,
-                     gint           root_y,
+                     int            button,
+                     int            root_x,
+                     int            root_y,
                      guint32        timestamp)
 {
   MoveResizeData *mv_resize = get_move_resize_data (GDK_SURFACE_DISPLAY (surface), TRUE);
@@ -4302,9 +4302,9 @@ emulate_resize_drag (GdkSurface     *surface,
 static void
 emulate_move_drag (GdkSurface *surface,
                    GdkDevice  *device,
-                   gint        button,
-                   gint        root_x,
-                   gint        root_y,
+                   int         button,
+                   int         root_x,
+                   int         root_y,
                    guint32     timestamp)
 {
   MoveResizeData *mv_resize = get_move_resize_data (GDK_SURFACE_DISPLAY (surface), TRUE);
@@ -4378,7 +4378,7 @@ gdk_x11_toplevel_begin_move (GdkToplevel *toplevel,
 {
   GdkSurface *surface = GDK_SURFACE (toplevel);
   int root_x, root_y;
-  gint direction;
+  int direction;
 
   if (GDK_SURFACE_DESTROYED (surface))
     return;
@@ -4522,7 +4522,7 @@ gdk_x11_surface_get_xid (GdkSurface *surface)
   return GDK_X11_SURFACE (surface)->xid;
 }
 
-static gint
+static int
 gdk_x11_surface_get_scale_factor (GdkSurface *surface)
 {
   GdkX11Surface *impl = GDK_X11_SURFACE (surface);
index 6fc7afd07d396d0f2547f7e26890c7b03035b9e9..eb23474afde2dcbd3aadb48550891768b53d655f 100644 (file)
@@ -57,15 +57,15 @@ struct _GdkX11Surface
   guint frame_sync_enabled : 1;
   guint tracking_damage: 1;
 
-  gint surface_scale;
+  int surface_scale;
 
   /* Width and height not divided by surface_scale - this matters in the
    * corner-case where the window manager assigns us a size that isn't
    * a multiple of surface_scale - for example for a maximized window
    * with an odd-sized title-bar.
    */
-  gint unscaled_width;
-  gint unscaled_height;
+  int unscaled_width;
+  int unscaled_height;
 
   cairo_surface_t *cairo_surface;
 
@@ -184,8 +184,8 @@ gboolean        _gdk_x11_surface_syncs_frames        (GdkSurface *surface);
 void            gdk_x11_surface_pre_damage           (GdkSurface *surface);
 
 void            gdk_x11_surface_move                 (GdkSurface *surface,
-                                                      gint        x,
-                                                      gint        y);
+                                                      int         x,
+                                                      int         y);
 void            gdk_x11_surface_check_monitor        (GdkSurface *surface,
                                                       GdkMonitor *monitor);
 
index 0e6999e7e4eadecb4440a870ba391ef15fef4156..fdd4228ad26644406d1d62995580fbbaacb60d7c 100644 (file)
@@ -38,7 +38,7 @@ struct _GdkX11TextListConverter
   GdkDisplay *display;
   
   const char *encoding; /* interned */
-  gint format;
+  int format;
 
   guint encoder : 1;
 };
@@ -82,7 +82,7 @@ gdk_x11_text_list_converter_decode (GdkX11TextListConverter *conv,
                                     gsize                   *bytes_written,
                                     GError                 **error)
 {
-  gint count;
+  int count;
   char **list;
 
   if (!(flags & G_CONVERTER_INPUT_AT_END))
@@ -132,7 +132,7 @@ char *
 gdk_x11_utf8_to_string_target (const char *utf8_str,
                                gboolean    return_latin1)
 {
-  gint len = strlen (utf8_str);
+  int len = strlen (utf8_str);
   GString *result = g_string_sized_new (len);
   const gchar *p = utf8_str;
 
@@ -164,7 +164,7 @@ gdk_x11_utf8_to_string_target (const char *utf8_str,
               else
                 {
                   char buf[7];
-                  gint buflen;
+                  int buflen;
 
                   buflen = g_unichar_to_utf8 (ch, buf);
                   g_string_append_len (result, buf, buflen);
@@ -223,8 +223,8 @@ gdk_x11_text_list_converter_encode (GdkX11TextListConverter *conv,
       GConverterResult result;
       guchar *text;
       const char *encoding;
-      gint format;
-      gint new_length;
+      int format;
+      int new_length;
       char *tmp;
 
       tmp = g_strndup (inbuf, inbuf_size);
index c43c853def2ccdf3eb761c0c26ef5416089a107c..ecb9ea6b6ff5aaca1e16ca1113592296e9c06cc7 100644 (file)
@@ -52,7 +52,7 @@ void
 _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen,
                               gboolean      setup_display)
 {
-  static const gint possible_depths[8] = { 32, 30, 24, 16, 15, 8, 4, 1 };
+  static const int possible_depths[8] = { 32, 30, 24, 16, 15, 8, 4, 1 };
   static const GdkVisualType possible_types[6] =
     {
       GDK_VISUAL_DIRECT_COLOR,
index 7fbf9d20d43ee37b37036597963b6296417b94ad..7b1acb4e0cd53bb84562b50e24939aa6e28b38c6 100644 (file)
@@ -57,10 +57,10 @@ struct _GdkX11Visual
   GObject parent_instance;
 
   GdkVisualType type;
-  gint depth;
+  int depth;
   GdkByteOrder byte_order;
-  gint colormap_size;
-  gint bits_per_rgb;
+  int colormap_size;
+  int bits_per_rgb;
 
   guint32 red_mask;
   guint32 green_mask;
index ae9e606303f9e5afc8522ef262ba230ec1d00013..956375dfab9ddc6193e1482e024e10c234ebfddb 100644 (file)
@@ -27,7 +27,7 @@
 G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
-gint  gdk_x11_device_get_id  (GdkDevice *device);
+int   gdk_x11_device_get_id  (GdkDevice *device);
 
 G_END_DECLS
 
index f1c9ac62c9d735f383f3a854d4647d4fe617f242..6f07b331a2df70ed8b9ac3bfd2e1b38557e3663f 100644 (file)
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
 GdkDevice * gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manager,
-                                           gint                    device_id);
+                                           int                     device_id);
 
 G_END_DECLS
 
index 78356d287f37f12b302a2d6bae9aa8988ea0d0f0..0eb84a802598043cbcb3ac134e7d96c60d687b5f 100644 (file)
@@ -92,7 +92,7 @@ void          gdk_x11_display_set_program_class                   (GdkDisplay  *
 GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                                 const gchar *theme,
-                                                const gint   size);
+                                                const int    size);
 
 GDK_AVAILABLE_IN_ALL
 void gdk_x11_display_broadcast_startup_message (GdkDisplay *display,
@@ -115,13 +115,13 @@ void        gdk_x11_display_ungrab            (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
 void        gdk_x11_display_set_surface_scale (GdkDisplay *display,
-                                               gint scale);
+                                               int scale);
 
 GDK_AVAILABLE_IN_ALL
 void                           gdk_x11_display_error_trap_push        (GdkDisplay *display);
 /* warn unused because you could use pop_ignored otherwise */
 GDK_AVAILABLE_IN_ALL
-G_GNUC_WARN_UNUSED_RESULT gint gdk_x11_display_error_trap_pop         (GdkDisplay *display);
+G_GNUC_WARN_UNUSED_RESULT int  gdk_x11_display_error_trap_pop         (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 void                           gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display);
 
index 4053ac4b4fdaa3d93879388e8d18ea56e4ca7f1a..4a6e049f7e9ca454d79e7c4f641b389d8e83c7d3 100644 (file)
@@ -41,8 +41,8 @@ GType gdk_x11_gl_context_get_type (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 gboolean        gdk_x11_display_get_glx_version (GdkDisplay *display,
-                                                 gint       *major,
-                                                 gint       *minor);
+                                                 int        *major,
+                                                 int        *minor);
 
 G_END_DECLS
 
index b0a047d30f9d013342eeaf896a30f8a002e22107..f18ddfeef84ae9b8256ee34ba0ca418ef5e0a0e9 100644 (file)
@@ -63,7 +63,7 @@ gboolean gdk_x11_screen_supports_net_wm_hint (GdkX11Screen *screen,
 
 GDK_AVAILABLE_IN_ALL
 XID      gdk_x11_screen_get_monitor_output   (GdkX11Screen *screen,
-                                              gint          monitor_num);
+                                              int           monitor_num);
 
 GDK_AVAILABLE_IN_ALL
 guint32  gdk_x11_screen_get_number_of_desktops (GdkX11Screen *screen);
index 3a078ffc6825854de78b5f710bf347c35f238ccf..7fd9f73892f47a627363e132b396e945be4c3ff0 100644 (file)
 G_BEGIN_DECLS
 
 GDK_AVAILABLE_IN_ALL
-gint     gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
+int      gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
                                                      const char   *encoding,
-                                                     gint          format,
+                                                     int           format,
                                                      const guchar *text,
-                                                     gint          length,
+                                                     int           length,
                                                      gchar      ***list);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_free_text_list                     (gchar       **list);
 GDK_AVAILABLE_IN_ALL
-gint     gdk_x11_display_string_to_compound_text    (GdkDisplay   *display,
+int      gdk_x11_display_string_to_compound_text    (GdkDisplay   *display,
                                                      const char   *str,
                                                      const char  **encoding,
-                                                     gint         *format,
+                                                     int          *format,
                                                      guchar      **ctext,
-                                                     gint         *length);
+                                                     int          *length);
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_x11_display_utf8_to_compound_text      (GdkDisplay   *display,
                                                      const char   *str,
                                                      const char  **encoding,
-                                                     gint         *format,
+                                                     int          *format,
                                                      guchar      **ctext,
-                                                     gint         *length);
+                                                     int          *length);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_free_compound_text                 (guchar       *ctext);
 
index 68b5f7d138d5394e6f8dafde636b6abffa0dbe01..2d3709c97c03ee4ad963b69d6e116a3bd456cbec 100644 (file)
@@ -54,7 +54,7 @@
 #include <gdkscreen-x11.h>
 #include <gdkprivate-x11.h>
 
-static gint
+static int
 parse_boolean (char *v)
 {
   gchar c0, c1;
@@ -87,7 +87,7 @@ get_boolean_default (GdkX11Screen *x11_screen,
 {
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
   gchar *v;
-  gint i;
+  int i;
 
   if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS))
       return FALSE;
@@ -136,7 +136,7 @@ get_double_default (GdkX11Screen *x11_screen,
 static gboolean
 get_integer_default (GdkX11Screen *x11_screen,
                     const gchar *option,
-                    gint        *value)
+                    int         *value)
 {
   Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen);
   gchar *v, *e;
index 6e8457667ad0e0d8ea86f40ff1b856997af83083..1013972bcf43706b845418202c1a8d9bfb52253c 100644 (file)
@@ -3740,8 +3740,8 @@ blur_once (cairo_surface_t *src,
 {
   int width, height, src_rowstride, dest_rowstride, n_channels;
   guchar *p_src, *p_dest, *c1, *c2;
-  gint x, y, i, i1, i2, width_minus_1, height_minus_1, radius_plus_1;
-  gint r, g, b, a;
+  int x, y, i, i1, i2, width_minus_1, height_minus_1, radius_plus_1;
+  int r, g, b, a;
   guchar *p_dest_row, *p_dest_col;
 
   width = cairo_image_surface_get_width (src);
index 7f3eeab9ae6ae2f5e82cac2f17a6a91936a114ad..cd91c90820bbccd0d430457b27416627bea81164 100644 (file)
@@ -89,7 +89,7 @@ gsk_vulkan_renderer_update_images_cb (GdkVulkanContext  *context,
                                       GskVulkanRenderer *self)
 {
   GdkSurface *window;
-  gint scale_factor;
+  int scale_factor;
   gsize width, height;
   guint i;
 
index c622a3b14b378c3f48d8d47cd8d600dd180e1ce2..51ed812ce72ddec9995ad681664a63d133243e77 100644 (file)
@@ -352,7 +352,7 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
         int i;
         guint count;
         guint texture_index;
-        gint x_position;
+        int x_position;
         GskVulkanRenderer *renderer = GSK_VULKAN_RENDERER (gsk_vulkan_render_get_renderer (render));
 
         if (has_color_glyphs)
index 694f86710d2e8412208ecfed15e8ba1394368ca8..3074c9f65fa0c556f8fb421fd406d520416c11f5 100644 (file)
@@ -29,7 +29,7 @@ struct _GtkBooleanCellAccessiblePrivate
 
 static AtkActionIface *parent_action_iface;
 
-static gint
+static int
 gtk_boolean_cell_accessible_get_n_actions (AtkAction *action)
 {
   return parent_action_iface->get_n_actions (action) + 1;
@@ -37,7 +37,7 @@ gtk_boolean_cell_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_boolean_cell_accessible_get_description (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   if (i == 0)
     return C_("Action description", "Toggles the cell");
@@ -47,7 +47,7 @@ gtk_boolean_cell_accessible_get_description (AtkAction *action,
 
 static const gchar *
 gtk_boolean_cell_accessible_action_get_name (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   if (i == 0)
     return "toggle";
@@ -57,7 +57,7 @@ gtk_boolean_cell_accessible_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_boolean_cell_accessible_action_get_localized_name (AtkAction *action,
-                                                       gint       i)
+                                                       int        i)
 {
   if (i == 0)
     return C_("Action name", "Toggle");
@@ -67,7 +67,7 @@ gtk_boolean_cell_accessible_action_get_localized_name (AtkAction *action,
 
 static gboolean
 gtk_boolean_cell_accessible_do_action (AtkAction *action,
-                                       gint       i)
+                                       int        i)
 {
   if (i == 0)
     return parent_action_iface->do_action (action, 2);
index 3c1385dc7898f5e4b328e75ee2b19f839a04318c..3afd64644f996a3c0217f7f3a456ff4e11e3e684 100644 (file)
@@ -137,7 +137,7 @@ gtk_button_accessible_get_name (AtkObject *obj)
   return name;
 }
 
-static gint
+static int
 gtk_button_accessible_get_n_children (AtkObject* obj)
 {
   return 0;
@@ -145,7 +145,7 @@ gtk_button_accessible_get_n_children (AtkObject* obj)
 
 static AtkObject *
 gtk_button_accessible_ref_child (AtkObject *obj,
-                                 gint       i)
+                                 int        i)
 {
   return NULL;
 }
@@ -204,7 +204,7 @@ gtk_button_accessible_init (GtkButtonAccessible *button)
 
 static gboolean
 gtk_button_accessible_do_action (AtkAction *action,
-                                 gint       i)
+                                 int        i)
 {
   GtkWidget *widget;
 
@@ -222,7 +222,7 @@ gtk_button_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_button_accessible_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -230,7 +230,7 @@ gtk_button_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_button_accessible_get_keybinding (AtkAction *action,
-                                      gint       i)
+                                      int        i)
 {
   gchar *return_value = NULL;
   GtkWidget *widget;
@@ -284,7 +284,7 @@ gtk_button_accessible_get_keybinding (AtkAction *action,
 
 static const gchar *
 gtk_button_accessible_action_get_name (AtkAction *action,
-                                       gint       i)
+                                       int        i)
 {
   if (i == 0)
     return "click";
@@ -293,7 +293,7 @@ gtk_button_accessible_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_button_accessible_action_get_localized_name (AtkAction *action,
-                                                 gint       i)
+                                                 int        i)
 {
   if (i == 0)
     return C_("Action name", "Click");
@@ -302,7 +302,7 @@ gtk_button_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_button_accessible_action_get_description (AtkAction *action,
-                                              gint       i)
+                                              int        i)
 {
   if (i == 0)
     return C_("Action description", "Clicks the button");
@@ -343,8 +343,8 @@ gtk_button_accessible_get_image_description (AtkImage *image)
 
 static void
 gtk_button_accessible_get_image_position (AtkImage     *image,
-                                          gint         *x,
-                                          gint         *y,
+                                          int          *x,
+                                          int          *y,
                                           AtkCoordType  coord_type)
 {
   GtkWidget *widget;
@@ -375,8 +375,8 @@ gtk_button_accessible_get_image_position (AtkImage     *image,
 
 static void
 gtk_button_accessible_get_image_size (AtkImage *image,
-                                      gint     *width,
-                                      gint     *height)
+                                      int      *width,
+                                      int      *height)
 {
   GtkWidget *widget;
   GtkWidget *button_image;
index e55144ba026347b35b324f7a9112f8ed47c13b7e..51bff40d29382c9ac743c5febaf9528049357b59 100644 (file)
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, gtk_cell_accessible, GTK_TYPE_ACCESS
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_TABLE_CELL, atk_table_cell_interface_init))
 
-static gint
+static int
 gtk_cell_accessible_get_index_in_parent (AtkObject *obj)
 {
   GtkCellAccessible *cell;
@@ -224,7 +224,7 @@ _gtk_cell_accessible_remove_state (GtkCellAccessible *cell,
   return TRUE;
 }
 
-static gint
+static int
 gtk_cell_accessible_action_get_n_actions (AtkAction *action)
 {
   return 3;
@@ -232,7 +232,7 @@ gtk_cell_accessible_action_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_cell_accessible_action_get_name (AtkAction *action,
-                                     gint       index)
+                                     int        index)
 {
   switch (index)
     {
@@ -249,7 +249,7 @@ gtk_cell_accessible_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_cell_accessible_action_get_localized_name (AtkAction *action,
-                                               gint       index)
+                                               int        index)
 {
   switch (index)
     {
@@ -266,7 +266,7 @@ gtk_cell_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_cell_accessible_action_get_description (AtkAction *action,
-                                            gint       index)
+                                            int        index)
 {
   switch (index)
     {
@@ -283,14 +283,14 @@ gtk_cell_accessible_action_get_description (AtkAction *action,
 
 static const gchar *
 gtk_cell_accessible_action_get_keybinding (AtkAction *action,
-                                           gint       index)
+                                           int        index)
 {
   return NULL;
 }
 
 static gboolean
 gtk_cell_accessible_action_do_action (AtkAction *action,
-                                      gint       index)
+                                      int        index)
 {
   GtkCellAccessible *cell = GTK_CELL_ACCESSIBLE (action);
   GtkCellAccessibleParent *parent;
@@ -331,10 +331,10 @@ atk_action_interface_init (AtkActionIface *iface)
 
 static void
 gtk_cell_accessible_get_extents (AtkComponent *component,
-                                 gint         *x,
-                                 gint         *y,
-                                 gint         *width,
-                                 gint         *height,
+                                 int          *x,
+                                 int          *y,
+                                 int          *width,
+                                 int          *height,
                                  AtkCoordType  coord_type)
 {
   GtkCellAccessible *cell;
@@ -388,8 +388,8 @@ gtk_cell_accessible_get_column_header_cells (AtkTableCell *table_cell)
 
 static gboolean
 gtk_cell_accessible_get_position (AtkTableCell *table_cell,
-                                  gint         *row,
-                                  gint         *column)
+                                  int          *row,
+                                  int          *column)
 {
   GtkCellAccessible *cell;
   AtkObject *parent;
index 535d907d09d36471a4ce2e0a07149a04c8fd3760..f0389fc486bc649c76a2551b46fde2887b3b3572 100644 (file)
@@ -52,10 +52,10 @@ gtk_cell_accessible_parent_get_type (void)
 void
 gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
                                              GtkCellAccessible       *cell,
-                                             gint                    *x,
-                                             gint                    *y,
-                                             gint                    *width,
-                                             gint                    *height,
+                                             int                     *x,
+                                             int                     *y,
+                                             int                     *width,
+                                             int                     *height,
                                              AtkCoordType             coord_type)
 {
   GtkCellAccessibleParentIface *iface;
@@ -207,8 +207,8 @@ gtk_cell_accessible_parent_update_relationset (GtkCellAccessibleParent *parent,
 void
 gtk_cell_accessible_parent_get_cell_position (GtkCellAccessibleParent *parent,
                                               GtkCellAccessible       *cell,
-                                              gint                    *row,
-                                              gint                    *column)
+                                              int                     *row,
+                                              int                     *column)
 {
   GtkCellAccessibleParentIface *iface;
 
index 1a8c2c62fb24484ce33897daa3e7682c6a7ac351..b724f711883faa7b2ffe010f1a1de3aca815dfa5 100644 (file)
@@ -49,10 +49,10 @@ struct _GtkCellAccessibleParentIface
   GTypeInterface parent;
   void     ( *get_cell_extents) (GtkCellAccessibleParent *parent,
                                  GtkCellAccessible       *cell,
-                                 gint                    *x,
-                                 gint                    *y,
-                                 gint                    *width,
-                                 gint                    *height,
+                                 int                     *x,
+                                 int                     *y,
+                                 int                     *width,
+                                 int                     *height,
                                  AtkCoordType             coord_type);
   void     ( *get_cell_area)    (GtkCellAccessibleParent *parent,
                                  GtkCellAccessible       *cell,
@@ -77,8 +77,8 @@ struct _GtkCellAccessibleParentIface
                                  AtkRelationSet          *relationset);
   void     ( *get_cell_position) (GtkCellAccessibleParent *parent,
                                   GtkCellAccessible       *cell,
-                                  gint                    *row,
-                                  gint                    *column);
+                                  int                     *row,
+                                  int                     *column);
   GPtrArray *   ( *get_column_header_cells) (GtkCellAccessibleParent *parent,
                                              GtkCellAccessible       *cell);
   GPtrArray *   ( *get_row_header_cells)    (GtkCellAccessibleParent *parent,
@@ -91,10 +91,10 @@ GType    gtk_cell_accessible_parent_get_type         (void);
 GDK_AVAILABLE_IN_ALL
 void     gtk_cell_accessible_parent_get_cell_extents (GtkCellAccessibleParent *parent,
                                                       GtkCellAccessible       *cell,
-                                                      gint                    *x,
-                                                      gint                    *y,
-                                                      gint                    *width,
-                                                      gint                    *height,
+                                                      int                     *x,
+                                                      int                     *y,
+                                                      int                     *width,
+                                                      int                     *height,
                                                       AtkCoordType             coord_type);
 GDK_AVAILABLE_IN_ALL
 void     gtk_cell_accessible_parent_get_cell_area    (GtkCellAccessibleParent *parent,
@@ -126,8 +126,8 @@ void     gtk_cell_accessible_parent_update_relationset (GtkCellAccessibleParent
 GDK_AVAILABLE_IN_ALL
 void     gtk_cell_accessible_parent_get_cell_position(GtkCellAccessibleParent *parent,
                                                       GtkCellAccessible       *cell,
-                                                      gint                    *row,
-                                                      gint                    *column);
+                                                      int                     *row,
+                                                      int                     *column);
 GDK_AVAILABLE_IN_ALL
 GPtrArray   *gtk_cell_accessible_parent_get_column_header_cells (GtkCellAccessibleParent *parent,
                                                                  GtkCellAccessible       *cell);
index 1c52fda18c86ac6bd2f81aa51012258b67780fa4..5ee14822b8b091ab145d63cd19a833873528d9af 100644 (file)
@@ -116,7 +116,7 @@ _gtk_color_swatch_accessible_init (GtkColorSwatchAccessible *self)
   ATK_OBJECT (self)->role = ATK_ROLE_RADIO_BUTTON;
 }
 
-static gint
+static int
 gtk_color_swatch_accessible_get_n_actions (AtkAction *action)
 {
   return 3;
@@ -124,14 +124,14 @@ gtk_color_swatch_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_color_swatch_accessible_get_keybinding (AtkAction *action,
-                                            gint       i)
+                                            int        i)
 {
   return NULL;
 }
 
 static const gchar *
 gtk_color_swatch_accessible_get_name (AtkAction *action,
-                                      gint       i)
+                                      int        i)
 {
   switch (i)
     {
@@ -144,7 +144,7 @@ gtk_color_swatch_accessible_get_name (AtkAction *action,
 
 static const gchar *
 gtk_color_swatch_accessible_get_localized_name (AtkAction *action,
-                                                gint       i)
+                                                int        i)
 {
   switch (i)
     {
@@ -157,7 +157,7 @@ gtk_color_swatch_accessible_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_color_swatch_accessible_get_description (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   switch (i)
     {
@@ -170,7 +170,7 @@ gtk_color_swatch_accessible_get_description (AtkAction *action,
 
 static gboolean
 gtk_color_swatch_accessible_do_action (AtkAction *action,
-                                       gint       i)
+                                       int        i)
 {
   GtkWidget *widget;
 
index bb9f7c9acfdbe900c0fcdabb23f3d4ebdf28b59f..2b29ad745758bf941a286aa71fb1c61d3b06f2f7 100644 (file)
@@ -24,7 +24,7 @@
 struct _GtkComboBoxAccessiblePrivate
 {
   gchar         *name;
-  gint           old_selection;
+  int            old_selection;
   gboolean       popup_set;
 };
 
@@ -42,7 +42,7 @@ changed_cb (GtkWidget *widget)
   GtkComboBox *combo_box;
   AtkObject *obj;
   GtkComboBoxAccessible *accessible;
-  gint index;
+  int index;
 
   combo_box = GTK_COMBO_BOX (widget);
 
@@ -104,8 +104,8 @@ gtk_combo_box_accessible_get_name (AtkObject *obj)
   GtkTreeIter iter;
   const gchar *name;
   GtkTreeModel *model;
-  gint n_columns;
-  gint i;
+  int n_columns;
+  int i;
 
   name = ATK_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->get_name (obj);
   if (name)
@@ -140,10 +140,10 @@ gtk_combo_box_accessible_get_name (AtkObject *obj)
   return accessible->priv->name;
 }
 
-static gint
+static int
 gtk_combo_box_accessible_get_n_children (AtkObject* obj)
 {
-  gint n_children = 0;
+  int n_children = 0;
   GtkWidget *widget;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
@@ -159,7 +159,7 @@ gtk_combo_box_accessible_get_n_children (AtkObject* obj)
 
 static AtkObject *
 gtk_combo_box_accessible_ref_child (AtkObject *obj,
-                                    gint       i)
+                                    int        i)
 {
   GtkWidget *widget;
   AtkObject *child;
@@ -216,7 +216,7 @@ gtk_combo_box_accessible_init (GtkComboBoxAccessible *combo_box)
 
 static gboolean
 gtk_combo_box_accessible_do_action (AtkAction *action,
-                                    gint       i)
+                                    int        i)
 {
   GtkComboBox *combo_box;
   GtkWidget *widget;
@@ -242,7 +242,7 @@ gtk_combo_box_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_combo_box_accessible_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -250,7 +250,7 @@ gtk_combo_box_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_combo_box_accessible_get_keybinding (AtkAction *action,
-                                         gint       i)
+                                         int        i)
 {
   GtkComboBoxAccessible *combo_box;
   GtkWidget *widget;
@@ -295,7 +295,7 @@ gtk_combo_box_accessible_get_keybinding (AtkAction *action,
 
 static const gchar *
 gtk_combo_box_accessible_action_get_name (AtkAction *action,
-                                          gint       i)
+                                          int        i)
 {
   if (i == 0)
     return "press";
@@ -304,7 +304,7 @@ gtk_combo_box_accessible_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_combo_box_accessible_action_get_localized_name (AtkAction *action,
-                                                    gint       i)
+                                                    int        i)
 {
   if (i == 0)
     return C_("Action name", "Press");
@@ -313,7 +313,7 @@ gtk_combo_box_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_combo_box_accessible_action_get_description (AtkAction *action,
-                                                 gint       i)
+                                                 int        i)
 {
   if (i == 0)
     return C_("Action description", "Presses the combobox");
@@ -333,7 +333,7 @@ atk_action_interface_init (AtkActionIface *iface)
 
 static gboolean
 gtk_combo_box_accessible_add_selection (AtkSelection *selection,
-                                        gint          i)
+                                        int           i)
 {
   GtkWidget *widget;
 
@@ -362,12 +362,12 @@ gtk_combo_box_accessible_clear_selection (AtkSelection *selection)
 
 static AtkObject *
 gtk_combo_box_accessible_ref_selection (AtkSelection *selection,
-                                        gint          i)
+                                        int           i)
 {
   GtkComboBox *combo_box;
   GtkWidget *widget;
   AtkObject *obj;
-  gint index;
+  int index;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (widget == NULL)
@@ -384,7 +384,7 @@ gtk_combo_box_accessible_ref_selection (AtkSelection *selection,
   return atk_object_ref_accessible_child (obj, index);
 }
 
-static gint
+static int
 gtk_combo_box_accessible_get_selection_count (AtkSelection *selection)
 {
   GtkWidget *widget;
@@ -398,10 +398,10 @@ gtk_combo_box_accessible_get_selection_count (AtkSelection *selection)
 
 static gboolean
 gtk_combo_box_accessible_is_child_selected (AtkSelection *selection,
-                                            gint          i)
+                                            int           i)
 {
   GtkWidget *widget;
-  gint j;
+  int j;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
 
@@ -415,7 +415,7 @@ gtk_combo_box_accessible_is_child_selected (AtkSelection *selection,
 
 static gboolean
 gtk_combo_box_accessible_remove_selection (AtkSelection *selection,
-                                           gint          i)
+                                           int           i)
 {
   if (atk_selection_is_child_selected (selection, i))
     atk_selection_clear_selection (selection);
index a756e3cadf2dca883fd4cb6578c6fd9eaf3d05d0..e581d98afc2b3425fd00cf44453474dc2e46fd37 100644 (file)
@@ -24,7 +24,7 @@
 struct _GtkContainerCellAccessiblePrivate
 {
   GList *children;
-  gint n_children;
+  int n_children;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkContainerCellAccessible, gtk_container_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE)
@@ -41,7 +41,7 @@ gtk_container_cell_accessible_finalize (GObject *obj)
 }
 
 
-static gint
+static int
 gtk_container_cell_accessible_get_n_children (AtkObject *obj)
 {
   GtkContainerCellAccessible *cell = GTK_CONTAINER_CELL_ACCESSIBLE (obj);
@@ -51,7 +51,7 @@ gtk_container_cell_accessible_get_n_children (AtkObject *obj)
 
 static AtkObject *
 gtk_container_cell_accessible_ref_child (AtkObject *obj,
-                                         gint       child)
+                                         int        child)
 {
   GtkContainerCellAccessible *cell = GTK_CONTAINER_CELL_ACCESSIBLE (obj);
   GList *l;
index f8a874833c1f9745ade1aa5538229f64093d9b74..88a7ffcbcc0d2507e8c37d94ad7621249d3955a7 100644 (file)
@@ -39,8 +39,8 @@
 
 struct _GtkEntryAccessiblePrivate
 {
-  gint cursor_position;
-  gint selection_bound;
+  int cursor_position;
+  int selection_bound;
   AtkObject *icons[2];
 };
 
@@ -219,7 +219,7 @@ gtk_entry_icon_accessible_class_init (GtkEntryIconAccessibleClass *klass)
 
 static gboolean
 gtk_entry_icon_accessible_do_action (AtkAction *action,
-                                     gint       i)
+                                     int        i)
 {
   GtkEntryIconAccessible *icon = (GtkEntryIconAccessible *)action;
   GtkWidget *widget;
@@ -245,7 +245,7 @@ gtk_entry_icon_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_entry_icon_accessible_get_n_actions (AtkAction *action)
 {
   GtkEntryIconAccessible *icon = GTK_ENTRY_ICON_ACCESSIBLE (action);
@@ -257,7 +257,7 @@ gtk_entry_icon_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_entry_icon_accessible_get_name (AtkAction *action,
-                                    gint       i)
+                                    int        i)
 {
   GtkEntryIconAccessible *icon = GTK_ENTRY_ICON_ACCESSIBLE (action);
   GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (icon->entry));
@@ -281,10 +281,10 @@ icon_atk_action_interface_init (AtkActionIface *iface)
 
 static void
 gtk_entry_icon_accessible_get_extents (AtkComponent   *component,
-                                       gint           *x,
-                                       gint           *y,
-                                       gint           *width,
-                                       gint           *height,
+                                       int            *x,
+                                       int            *y,
+                                       int            *width,
+                                       int            *height,
                                        AtkCoordType    coord_type)
 {
   GtkEntryIconAccessible *icon = GTK_ENTRY_ICON_ACCESSIBLE (component);
@@ -309,8 +309,8 @@ gtk_entry_icon_accessible_get_extents (AtkComponent   *component,
 
 static void
 gtk_entry_icon_accessible_get_position (AtkComponent   *component,
-                                        gint           *x,
-                                        gint           *y,
+                                        int            *x,
+                                        int            *y,
                                         AtkCoordType    coord_type)
 {
   GtkEntryIconAccessible *icon = GTK_ENTRY_ICON_ACCESSIBLE (component);
@@ -333,8 +333,8 @@ gtk_entry_icon_accessible_get_position (AtkComponent   *component,
 
 static void
 gtk_entry_icon_accessible_get_size (AtkComponent *component,
-                                gint         *width,
-                                gint         *height)
+                                int          *width,
+                                int          *height)
 {
   GtkEntryIconAccessible *icon = GTK_ENTRY_ICON_ACCESSIBLE (component);
   GdkRectangle icon_area;
@@ -389,7 +389,7 @@ check_for_selection_change (GtkEntryAccessible *accessible,
                             GtkEditable        *editable)
 {
   gboolean ret_val = FALSE;
-  gint start, end;
+  int start, end;
 
   if (gtk_editable_get_selection_bounds (editable, &start, &end))
     {
@@ -419,8 +419,8 @@ check_for_selection_change (GtkEntryAccessible *accessible,
 static void
 insert_text_cb (GtkEditable        *editable,
                 gchar              *new_text,
-                gint                new_text_length,
-                gint               *position,
+                int                 new_text_length,
+                int                *position,
                 GtkEntryAccessible *self)
 {
   int length;
@@ -443,8 +443,8 @@ insert_text_cb (GtkEditable        *editable,
  */
 static void
 delete_text_cb (GtkEditable        *editable,
-                gint                start,
-                gint                end,
+                int                 start,
+                int                 end,
                 GtkEntryAccessible *self)
 {
   GtkText *textw;
@@ -535,7 +535,7 @@ on_notify (GObject            *gobject,
     }
   else if (g_strcmp0 (pspec->name, "secondary-icon-storage-type") == 0)
     {
-      gint index = (priv->icons[GTK_ENTRY_ICON_PRIMARY] ? 1 : 0);
+      int index = (priv->icons[GTK_ENTRY_ICON_PRIMARY] ? 1 : 0);
       if (gtk_entry_get_icon_storage_type (GTK_ENTRY (widget), GTK_ENTRY_ICON_SECONDARY) != GTK_IMAGE_EMPTY &&
           !priv->icons[GTK_ENTRY_ICON_SECONDARY])
         {
@@ -705,7 +705,7 @@ gtk_entry_accessible_initialize (AtkObject *obj,
 {
   GtkWidget *widget;
   GtkEntryAccessible *gtk_entry_accessible;
-  gint start_pos, end_pos;
+  int start_pos, end_pos;
 
   ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->initialize (obj, data);
 
@@ -722,7 +722,7 @@ gtk_entry_accessible_initialize (AtkObject *obj,
   g_signal_connect (widget, "notify", G_CALLBACK (on_notify), obj);
 }
 
-static gint
+static int
 gtk_entry_accessible_get_index_in_parent (AtkObject *accessible)
 {
   /*
@@ -736,11 +736,11 @@ gtk_entry_accessible_get_index_in_parent (AtkObject *accessible)
   return ATK_OBJECT_CLASS (gtk_entry_accessible_parent_class)->get_index_in_parent (accessible);
 }
 
-static gint
+static int
 gtk_entry_accessible_get_n_children (AtkObject* obj)
 {
   GtkWidget *widget;
-  gint count = 0;
+  int count = 0;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
@@ -756,7 +756,7 @@ gtk_entry_accessible_get_n_children (AtkObject* obj)
 
 static AtkObject *
 gtk_entry_accessible_ref_child (AtkObject *obj,
-                                gint i)
+                                int i)
 {
   GtkEntryAccessible *accessible = GTK_ENTRY_ACCESSIBLE (obj);
   GtkEntryAccessiblePrivate *priv = accessible->priv;
@@ -833,8 +833,8 @@ gtk_entry_accessible_init (GtkEntryAccessible *entry)
 
 static gchar *
 gtk_entry_accessible_get_text (AtkText *atk_text,
-                               gint     start_pos,
-                               gint     end_pos)
+                               int      start_pos,
+                               int      end_pos)
 {
   GtkText *text;
 
@@ -848,10 +848,10 @@ gtk_entry_accessible_get_text (AtkText *atk_text,
 
 static gchar *
 gtk_entry_accessible_get_text_before_offset (AtkText         *atk_text,
-                                             gint             offset,
+                                             int              offset,
                                              AtkTextBoundary  boundary_type,
-                                             gint            *start_offset,
-                                             gint            *end_offset)
+                                             int             *start_offset,
+                                             int             *end_offset)
 {
   GtkText *text;
 
@@ -867,10 +867,10 @@ gtk_entry_accessible_get_text_before_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_entry_accessible_get_text_at_offset (AtkText         *atk_text,
-                                         gint             offset,
+                                         int              offset,
                                          AtkTextBoundary  boundary_type,
-                                         gint            *start_offset,
-                                         gint            *end_offset)
+                                         int             *start_offset,
+                                         int             *end_offset)
 {
   GtkText *text;
 
@@ -886,10 +886,10 @@ gtk_entry_accessible_get_text_at_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_entry_accessible_get_text_after_offset (AtkText         *atk_text,
-                                            gint             offset,
+                                            int              offset,
                                             AtkTextBoundary  boundary_type,
-                                            gint            *start_offset,
-                                            gint            *end_offset)
+                                            int             *start_offset,
+                                            int             *end_offset)
 {
   GtkText *text;
 
@@ -903,7 +903,7 @@ gtk_entry_accessible_get_text_after_offset (AtkText         *atk_text,
                                     start_offset, end_offset);
 }
 
-static gint
+static int
 gtk_entry_accessible_get_character_count (AtkText *atk_text)
 {
   GtkText *text;
@@ -927,7 +927,7 @@ gtk_entry_accessible_get_character_count (AtkText *atk_text)
   return char_count;
 }
 
-static gint
+static int
 gtk_entry_accessible_get_caret_offset (AtkText *text)
 {
   GtkWidget *widget;
@@ -947,7 +947,7 @@ gtk_entry_accessible_get_caret_offset (AtkText *text)
 
 static gboolean
 gtk_entry_accessible_set_caret_offset (AtkText *text,
-                                       gint     offset)
+                                       int      offset)
 {
   GtkWidget *widget;
 
@@ -963,7 +963,7 @@ gtk_entry_accessible_set_caret_offset (AtkText *text,
 static AtkAttributeSet *
 add_text_attribute (AtkAttributeSet  *attributes,
                     AtkTextAttribute  attr,
-                    gint              i)
+                    int               i)
 {
   AtkAttribute *at;
 
@@ -976,9 +976,9 @@ add_text_attribute (AtkAttributeSet  *attributes,
 
 static AtkAttributeSet *
 gtk_entry_accessible_get_run_attributes (AtkText *atk_text,
-                                         gint     offset,
-                                         gint    *start_offset,
-                                         gint    *end_offset)
+                                         int      offset,
+                                         int     *start_offset,
+                                         int     *end_offset)
 {
   GtkText *text;
   AtkAttributeSet *attributes;
@@ -1024,17 +1024,17 @@ gtk_entry_accessible_get_default_attributes (AtkText *atk_text)
 
 static void
 gtk_entry_accessible_get_character_extents (AtkText      *atk_text,
-                                            gint          offset,
-                                            gint         *x,
-                                            gint         *y,
-                                            gint         *width,
-                                            gint         *height,
+                                            int           offset,
+                                            int          *x,
+                                            int          *y,
+                                            int          *width,
+                                            int          *height,
                                             AtkCoordType  coords)
 {
   GtkText *textw;
   PangoRectangle char_rect;
   gchar *entry_text;
-  gint index, x_layout, y_layout;
+  int index, x_layout, y_layout;
   GtkAllocation allocation;
 
   textw = get_text (atk_text);
@@ -1058,16 +1058,16 @@ gtk_entry_accessible_get_character_extents (AtkText      *atk_text,
   *height = char_rect.height;
 }
 
-static gint
+static int
 gtk_entry_accessible_get_offset_at_point (AtkText      *atk_text,
-                                          gint          x,
-                                          gint          y,
+                                          int           x,
+                                          int           y,
                                           AtkCoordType  coords)
 {
   GtkText *textw;
   gchar *text;
-  gint index, x_layout, y_layout;
-  gint x_local, y_local;
+  int index, x_layout, y_layout;
+  int x_local, y_local;
   glong offset;
 
   textw = get_text (atk_text);
@@ -1102,11 +1102,11 @@ gtk_entry_accessible_get_offset_at_point (AtkText      *atk_text,
   return offset;
 }
 
-static gint
+static int
 gtk_entry_accessible_get_n_selections (AtkText *text)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -1120,9 +1120,9 @@ gtk_entry_accessible_get_n_selections (AtkText *text)
 
 static gchar *
 gtk_entry_accessible_get_selection (AtkText *text,
-                                    gint     selection_num,
-                                    gint    *start_pos,
-                                    gint    *end_pos)
+                                    int      selection_num,
+                                    int     *start_pos,
+                                    int     *end_pos)
 {
   GtkWidget *widget;
 
@@ -1141,12 +1141,12 @@ gtk_entry_accessible_get_selection (AtkText *text,
 
 static gboolean
 gtk_entry_accessible_add_selection (AtkText *text,
-                                    gint     start_pos,
-                                    gint     end_pos)
+                                    int      start_pos,
+                                    int      end_pos)
 {
   GtkEntry *entry;
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -1165,10 +1165,10 @@ gtk_entry_accessible_add_selection (AtkText *text,
 
 static gboolean
 gtk_entry_accessible_remove_selection (AtkText *text,
-                                       gint     selection_num)
+                                       int      selection_num)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -1188,12 +1188,12 @@ gtk_entry_accessible_remove_selection (AtkText *text,
 
 static gboolean
 gtk_entry_accessible_set_selection (AtkText *text,
-                                    gint     selection_num,
-                                    gint     start_pos,
-                                    gint     end_pos)
+                                    int      selection_num,
+                                    int      start_pos,
+                                    int      end_pos)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -1213,7 +1213,7 @@ gtk_entry_accessible_set_selection (AtkText *text,
 
 static gunichar
 gtk_entry_accessible_get_character_at_offset (AtkText *atk_text,
-                                              gint     offset)
+                                              int      offset)
 {
   GtkText *textw;
   gchar *text;
@@ -1282,8 +1282,8 @@ gtk_entry_accessible_set_text_contents (AtkEditableText *text,
 static void
 gtk_entry_accessible_insert_text (AtkEditableText *text,
                                   const gchar     *string,
-                                  gint             length,
-                                  gint            *position)
+                                  int              length,
+                                  int             *position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -1302,8 +1302,8 @@ gtk_entry_accessible_insert_text (AtkEditableText *text,
 
 static void
 gtk_entry_accessible_copy_text (AtkEditableText *text,
-                                gint             start_pos,
-                                gint             end_pos)
+                                int              start_pos,
+                                int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -1323,8 +1323,8 @@ gtk_entry_accessible_copy_text (AtkEditableText *text,
 
 static void
 gtk_entry_accessible_cut_text (AtkEditableText *text,
-                               gint             start_pos,
-                               gint             end_pos)
+                               int              start_pos,
+                               int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -1347,8 +1347,8 @@ gtk_entry_accessible_cut_text (AtkEditableText *text,
 
 static void
 gtk_entry_accessible_delete_text (AtkEditableText *text,
-                                  gint             start_pos,
-                                  gint             end_pos)
+                                  int              start_pos,
+                                  int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -1367,7 +1367,7 @@ gtk_entry_accessible_delete_text (AtkEditableText *text,
 typedef struct
 {
   GtkEntry* entry;
-  gint position;
+  int position;
 } PasteData;
 
 static void
@@ -1390,7 +1390,7 @@ paste_received_cb (GObject      *clipboard,
 
 static void
 gtk_entry_accessible_paste_text (AtkEditableText *text,
-                                 gint             position)
+                                 int              position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -1428,7 +1428,7 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface)
 
 static gboolean
 gtk_entry_accessible_do_action (AtkAction *action,
-                                gint       i)
+                                int        i)
 {
   GtkWidget *widget;
 
@@ -1447,7 +1447,7 @@ gtk_entry_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_entry_accessible_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -1455,7 +1455,7 @@ gtk_entry_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_entry_accessible_get_keybinding (AtkAction *action,
-                                     gint       i)
+                                     int        i)
 {
   GtkWidget *widget;
   GtkWidget *label;
@@ -1500,7 +1500,7 @@ gtk_entry_accessible_get_keybinding (AtkAction *action,
 
 static const gchar*
 gtk_entry_accessible_action_get_name (AtkAction *action,
-                                      gint       i)
+                                      int        i)
 {
   if (i == 0)
     return "activate";
@@ -1509,7 +1509,7 @@ gtk_entry_accessible_action_get_name (AtkAction *action,
 
 static const gchar*
 gtk_entry_accessible_action_get_localized_name (AtkAction *action,
-                                                gint       i)
+                                                int        i)
 {
   if (i == 0)
     return C_("Action name", "Activate");
@@ -1518,7 +1518,7 @@ gtk_entry_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar*
 gtk_entry_accessible_action_get_description (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   if (i == 0)
     return C_("Action description", "Activates the entry");
index a4d323df15611afad48cfcb2fe3209715a3bf519..8644675d116f46e35a16df5ea78bc37834d2f6ad 100644 (file)
@@ -57,7 +57,7 @@ gtk_expander_accessible_get_name (AtkObject *obj)
   return gtk_expander_accessible_get_full_text (GTK_EXPANDER (widget));
 }
 
-static gint
+static int
 gtk_expander_accessible_get_n_children (AtkObject *obj)
 {
   GtkWidget *widget;
@@ -74,7 +74,7 @@ gtk_expander_accessible_get_n_children (AtkObject *obj)
 
 static AtkObject *
 gtk_expander_accessible_ref_child (AtkObject *obj,
-                                   gint       i)
+                                   int        i)
 {
   AtkObject *accessible;
   GtkWidget *widget;
@@ -160,7 +160,7 @@ gtk_expander_accessible_init (GtkExpanderAccessible *self)
 
 static gboolean
 gtk_expander_accessible_do_action (AtkAction *action,
-                                   gint       i)
+                                   int        i)
 {
   GtkWidget *widget;
 
@@ -178,7 +178,7 @@ gtk_expander_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_expander_accessible_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -186,7 +186,7 @@ gtk_expander_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_expander_accessible_get_keybinding (AtkAction *action,
-                                        gint       i)
+                                        int        i)
 {
   gchar *return_value = NULL;
   GtkWidget *widget;
@@ -214,7 +214,7 @@ gtk_expander_accessible_get_keybinding (AtkAction *action,
 
 static const gchar *
 gtk_expander_accessible_action_get_name (AtkAction *action,
-                                         gint       i)
+                                         int        i)
 {
   if (i == 0)
     return "activate";
@@ -223,7 +223,7 @@ gtk_expander_accessible_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_expander_accessible_action_get_localized_name (AtkAction *action,
-                                                   gint       i)
+                                                   int        i)
 {
   if (i == 0)
     return C_("Action name", "Activate");
@@ -232,7 +232,7 @@ gtk_expander_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_expander_accessible_action_get_description (AtkAction *action,
-                                                gint       i)
+                                                int        i)
 {
   if (i == 0)
     return C_("Action description", "Activates the expander");
index 40b65857fc2e313edb8cdcb34d7195d2f2e1b866..4b0a07d5f847c14e13037633e8c30d9a5715ceae 100644 (file)
@@ -66,7 +66,7 @@ gtk_flow_box_accessible_class_init (GtkFlowBoxAccessibleClass *klass)
 
 static gboolean
 gtk_flow_box_accessible_add_selection (AtkSelection *selection,
-                                       gint          idx)
+                                       int           idx)
 {
   GtkWidget *box;
   GtkWidget *child;
@@ -91,7 +91,7 @@ gtk_flow_box_accessible_add_selection (AtkSelection *selection,
 
 static gboolean
 gtk_flow_box_accessible_remove_selection (AtkSelection *selection,
-                                          gint          idx)
+                                          int           idx)
 {
   GtkWidget *box;
   GtkWidget *child;
@@ -142,7 +142,7 @@ gtk_flow_box_accessible_select_all (AtkSelection *selection)
 
 typedef struct
 {
-  gint idx;
+  int idx;
   GtkWidget *child;
 } FindSelectedData;
 
@@ -164,7 +164,7 @@ find_selected_child (GtkFlowBox      *box,
 
 static AtkObject *
 gtk_flow_box_accessible_ref_selection (AtkSelection *selection,
-                                       gint          idx)
+                                       int           idx)
 {
   GtkWidget *box;
   AtkObject *accessible;
@@ -191,15 +191,15 @@ count_selected (GtkFlowBox      *box,
                 GtkFlowBoxChild *child,
                 gpointer         data)
 {
-  gint *count = data;
+  int *count = data;
   *count += 1;
 }
 
-static gint
+static int
 gtk_flow_box_accessible_get_selection_count (AtkSelection *selection)
 {
   GtkWidget *box;
-  gint count;
+  int count;
 
   box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (box == NULL)
@@ -213,7 +213,7 @@ gtk_flow_box_accessible_get_selection_count (AtkSelection *selection)
 
 static gboolean
 gtk_flow_box_accessible_is_child_selected (AtkSelection *selection,
-                                           gint          idx)
+                                           int           idx)
 {
   GtkWidget *box;
   GtkFlowBoxChild *child;
index db2d56d0793315b30efbf7e8f3be4db24031bffe..4a4fd8e9a10438ad1d04a0e05f2cff5725949d55 100644 (file)
@@ -96,7 +96,7 @@ idle_do_action (gpointer data)
 
 static gboolean
 gtk_icon_view_item_accessible_do_action (AtkAction *action,
-                                         gint       i)
+                                         int        i)
 {
   GtkIconViewItemAccessible *item;
 
@@ -120,7 +120,7 @@ gtk_icon_view_item_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_icon_view_item_accessible_get_n_actions (AtkAction *action)
 {
         return 1;
@@ -128,7 +128,7 @@ gtk_icon_view_item_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_icon_view_item_accessible_get_description (AtkAction *action,
-                                               gint       i)
+                                               int        i)
 {
   GtkIconViewItemAccessible *item;
 
@@ -145,7 +145,7 @@ gtk_icon_view_item_accessible_get_description (AtkAction *action,
 
 static const gchar *
 gtk_icon_view_item_accessible_get_name (AtkAction *action,
-                                        gint       i)
+                                        int        i)
 {
   if (i != 0)
     return NULL;
@@ -155,7 +155,7 @@ gtk_icon_view_item_accessible_get_name (AtkAction *action,
 
 static gboolean
 gtk_icon_view_item_accessible_set_description (AtkAction   *action,
-                                               gint         i,
+                                               int          i,
                                                const gchar *description)
 {
   GtkIconViewItemAccessible *item;
@@ -273,8 +273,8 @@ get_text (GtkIconView     *icon_view,
 
 static void
 gtk_icon_view_item_accessible_get_image_size (AtkImage *image,
-                                              gint     *width,
-                                              gint     *height)
+                                              int      *width,
+                                              int      *height)
 {
   GtkIconViewItemAccessible *item;
   GdkRectangle box;
@@ -299,8 +299,8 @@ gtk_icon_view_item_accessible_get_image_size (AtkImage *image,
 
 static void
 gtk_icon_view_item_accessible_get_image_position (AtkImage    *image,
-                                                  gint        *x,
-                                                  gint        *y,
+                                                  int         *x,
+                                                  int         *y,
                                                   AtkCoordType coord_type)
 {
   GtkIconViewItemAccessible *item;
@@ -336,8 +336,8 @@ atk_image_item_interface_init (AtkImageIface *iface)
 
 static gchar *
 gtk_icon_view_item_accessible_get_text (AtkText *text,
-                                        gint     start_pos,
-                                        gint     end_pos)
+                                        int      start_pos,
+                                        int      end_pos)
 {
   GtkIconViewItemAccessible *item;
 
@@ -353,7 +353,7 @@ gtk_icon_view_item_accessible_get_text (AtkText *text,
 
 static gunichar
 gtk_icon_view_item_accessible_get_character_at_offset (AtkText *text,
-                                                       gint     offset)
+                                                       int      offset)
 {
   GtkIconViewItemAccessible *item;
   gchar *string;
@@ -388,10 +388,10 @@ create_pango_layout (GtkIconViewItemAccessible *item)
 
 static gchar *
 gtk_icon_view_item_accessible_get_text_before_offset (AtkText         *atk_text,
-                                                      gint             offset,
+                                                      int              offset,
                                                       AtkTextBoundary  boundary_type,
-                                                      gint            *start_offset,
-                                                      gint            *end_offset)
+                                                      int             *start_offset,
+                                                      int             *end_offset)
 {
   GtkIconViewItemAccessible *item;
   PangoLayout *layout;
@@ -410,10 +410,10 @@ gtk_icon_view_item_accessible_get_text_before_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_icon_view_item_accessible_get_text_at_offset (AtkText         *atk_text,
-                                                  gint             offset,
+                                                  int              offset,
                                                   AtkTextBoundary  boundary_type,
-                                                  gint            *start_offset,
-                                                  gint            *end_offset)
+                                                  int             *start_offset,
+                                                  int             *end_offset)
 {
   GtkIconViewItemAccessible *item;
   PangoLayout *layout;
@@ -432,10 +432,10 @@ gtk_icon_view_item_accessible_get_text_at_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_icon_view_item_accessible_get_text_after_offset (AtkText         *atk_text,
-                                                     gint             offset,
+                                                     int              offset,
                                                      AtkTextBoundary  boundary_type,
-                                                     gint            *start_offset,
-                                                     gint            *end_offset)
+                                                     int             *start_offset,
+                                                     int             *end_offset)
 {
   GtkIconViewItemAccessible *item;
   PangoLayout *layout;
@@ -452,7 +452,7 @@ gtk_icon_view_item_accessible_get_text_after_offset (AtkText         *atk_text,
   return text;
 }
 
-static gint
+static int
 gtk_icon_view_item_accessible_get_character_count (AtkText *text)
 {
   GtkIconViewItemAccessible *item;
@@ -469,11 +469,11 @@ gtk_icon_view_item_accessible_get_character_count (AtkText *text)
 
 static void
 gtk_icon_view_item_accessible_get_character_extents (AtkText      *text,
-                                                     gint         offset,
-                                                     gint         *x,
-                                                     gint         *y,
-                                                     gint         *width,
-                                                     gint         *height,
+                                                     int          offset,
+                                                     int          *x,
+                                                     int          *y,
+                                                     int          *width,
+                                                     int          *height,
                                                      AtkCoordType coord_type)
 {
   GtkIconViewItemAccessible *item;
@@ -481,7 +481,7 @@ gtk_icon_view_item_accessible_get_character_extents (AtkText      *text,
   GtkIconView *icon_view;
   PangoRectangle char_rect;
   const gchar *item_text;
-  gint index;
+  int index;
 #endif
 
   item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
@@ -510,19 +510,19 @@ gtk_icon_view_item_accessible_get_character_extents (AtkText      *text,
 #endif
 }
 
-static gint
+static int
 gtk_icon_view_item_accessible_get_offset_at_point (AtkText      *text,
-                                                   gint          x,
-                                                   gint          y,
+                                                   int           x,
+                                                   int           y,
                                                    AtkCoordType coord_type)
 {
   GtkIconViewItemAccessible *item;
-  gint offset = 0;
+  int offset = 0;
 #if 0
   GtkIconView *icon_view;
   const gchar *item_text;
-  gint index;
-  gint l_x, l_y;
+  int index;
+  int l_x, l_y;
 #endif
 
   item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text);
@@ -575,15 +575,15 @@ atk_text_item_interface_init (AtkTextIface *iface)
 
 static void
 gtk_icon_view_item_accessible_get_extents (AtkComponent *component,
-                                           gint         *x,
-                                           gint         *y,
-                                           gint         *width,
-                                           gint         *height,
+                                           int          *x,
+                                           int          *y,
+                                           int          *width,
+                                           int          *height,
                                            AtkCoordType  coord_type)
 {
   GtkIconViewItemAccessible *item;
   AtkObject *parent_obj;
-  gint l_x, l_y;
+  int l_x, l_y;
 
   g_return_if_fail (GTK_IS_ICON_VIEW_ITEM_ACCESSIBLE (component));
 
@@ -799,7 +799,7 @@ _gtk_icon_view_item_accessible_get_parent (AtkObject *obj)
     return NULL;
 }
 
-static gint
+static int
 _gtk_icon_view_item_accessible_get_index_in_parent (AtkObject *obj)
 {
   GtkIconViewItemAccessible *item;
@@ -892,7 +892,7 @@ gtk_icon_view_item_accessible_info_new (GtkIconViewAccessible     *self,
   priv->items = g_list_insert_before (priv->items, items, info);
 }
 
-static gint
+static int
 gtk_icon_view_accessible_get_n_children (AtkObject *accessible)
 {
   GtkIconView *icon_view;
@@ -909,7 +909,7 @@ gtk_icon_view_accessible_get_n_children (AtkObject *accessible)
 
 static GtkIconViewItemAccessible *
 gtk_icon_view_accessible_find_child (GtkIconViewAccessible *self,
-                                     gint                   index)
+                                     int                    index)
 {
   GtkIconViewAccessiblePrivate *priv = gtk_icon_view_accessible_get_instance_private (self);
   GList *items;
@@ -932,7 +932,7 @@ gtk_icon_view_accessible_find_child (GtkIconViewAccessible *self,
 
 static AtkObject *
 gtk_icon_view_accessible_ref_child (AtkObject *accessible,
-                                    gint       index)
+                                    int        index)
 {
   GtkIconViewAccessible *self = GTK_ICON_VIEW_ACCESSIBLE (accessible);
   GtkIconViewItemAccessible *a11y_item;
@@ -1148,7 +1148,7 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
   gtk_icon_view_accessible_traverse_items (self, tmp_list);
 }
 
-static gint
+static int
 gtk_icon_view_accessible_item_compare (ItemAccessibleInfo *i1,
                                        ItemAccessibleInfo *i2)
 {
@@ -1159,7 +1159,7 @@ static void
 gtk_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
                                                GtkTreePath  *path,
                                                GtkTreeIter  *iter,
-                                               gint         *new_order,
+                                               int          *new_order,
                                                gpointer      user_data)
 {
   GtkIconViewAccessible *self = user_data;
@@ -1327,14 +1327,14 @@ gtk_icon_view_accessible_init (GtkIconViewAccessible *accessible)
 
 static AtkObject*
 gtk_icon_view_accessible_ref_accessible_at_point (AtkComponent *component,
-                                                  gint          x,
-                                                  gint          y,
+                                                  int           x,
+                                                  int           y,
                                                   AtkCoordType  coord_type)
 {
   GtkWidget *widget;
   GtkIconView *icon_view;
   GtkIconViewItem *item;
-  gint x_pos, y_pos;
+  int x_pos, y_pos;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (component));
   if (widget == NULL)
@@ -1357,7 +1357,7 @@ atk_component_interface_init (AtkComponentIface *iface)
 
 static gboolean
 gtk_icon_view_accessible_add_selection (AtkSelection *selection,
-                                        gint          i)
+                                        int           i)
 {
   GtkWidget *widget;
   GtkIconView *icon_view;
@@ -1396,7 +1396,7 @@ gtk_icon_view_accessible_clear_selection (AtkSelection *selection)
 
 static AtkObject*
 gtk_icon_view_accessible_ref_selection (AtkSelection *selection,
-                                        gint          i)
+                                        int           i)
 {
   GList *l;
   GtkWidget *widget;
@@ -1426,14 +1426,14 @@ gtk_icon_view_accessible_ref_selection (AtkSelection *selection,
   return NULL;
 }
 
-static gint
+static int
 gtk_icon_view_accessible_get_selection_count (AtkSelection *selection)
 {
   GtkWidget *widget;
   GtkIconView *icon_view;
   GtkIconViewItem *item;
   GList *l;
-  gint count;
+  int count;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (widget == NULL)
@@ -1458,7 +1458,7 @@ gtk_icon_view_accessible_get_selection_count (AtkSelection *selection)
 
 static gboolean
 gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
-                                            gint          i)
+                                            int           i)
 {
   GtkWidget *widget;
   GtkIconView *icon_view;
@@ -1479,13 +1479,13 @@ gtk_icon_view_accessible_is_child_selected (AtkSelection *selection,
 
 static gboolean
 gtk_icon_view_accessible_remove_selection (AtkSelection *selection,
-                                           gint          i)
+                                           int           i)
 {
   GtkWidget *widget;
   GtkIconView *icon_view;
   GtkIconViewItem *item;
   GList *l;
-  gint count;
+  int count;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (widget == NULL)
index e299f3d4cc62048a66f9611aab28f2506dae1019..98e6d5843dba7d9a1db8ebb00f9c9aa93927d0cb 100644 (file)
@@ -177,7 +177,7 @@ name_from_icon_name (const gchar *icon_name)
 {
   gchar *name;
   const gchar *label;
-  gint i;
+  int i;
 
   name = g_strdup (icon_name);
   if (g_str_has_suffix (name, "-symbolic"))
@@ -281,8 +281,8 @@ gtk_image_accessible_get_image_description (AtkImage *image)
 
 static void
 gtk_image_accessible_get_image_position (AtkImage     *image,
-                                         gint         *x,
-                                         gint         *y,
+                                         int          *x,
+                                         int          *y,
                                          AtkCoordType  coord_type)
 {
   atk_component_get_extents (ATK_COMPONENT (image), x, y, NULL, NULL,
@@ -291,8 +291,8 @@ gtk_image_accessible_get_image_position (AtkImage     *image,
 
 static void
 gtk_image_accessible_get_image_size (AtkImage *image,
-                                     gint     *width,
-                                     gint     *height)
+                                     int      *width,
+                                     int      *height)
 {
   GtkWidget* widget;
   GtkImage *gtk_image;
index 152c456c2630b6bac456708705b3bacfc06fe0c5..56827237f76bf9bb955cfb8e6c23522dd632a778 100644 (file)
@@ -79,8 +79,8 @@ gtk_image_cell_accessible_set_image_description (AtkImage    *image,
 
 static void
 gtk_image_cell_accessible_get_image_position (AtkImage     *image,
-                                              gint         *x,
-                                              gint         *y,
+                                              int          *x,
+                                              int          *y,
                                               AtkCoordType  coord_type)
 {
   atk_component_get_extents (ATK_COMPONENT (image), x, y, NULL, NULL,
@@ -89,8 +89,8 @@ gtk_image_cell_accessible_get_image_position (AtkImage     *image,
 
 static void
 gtk_image_cell_accessible_get_image_size (AtkImage *image,
-                                          gint     *width,
-                                          gint     *height)
+                                          int      *width,
+                                          int      *height)
 {
   GtkImageCellAccessible *cell = GTK_IMAGE_CELL_ACCESSIBLE (image);
   GtkCellRenderer *cell_renderer;
index 2048a7c0b357f1b4ae2d5ee0f80088977b052ba6..7c53c309f022124a8cdf77212d33d0d8eec9d04e 100644 (file)
@@ -29,8 +29,8 @@
 
 struct _GtkLabelAccessiblePrivate
 {
-  gint cursor_position;
-  gint selection_bound;
+  int cursor_position;
+  int selection_bound;
 
   GList *links;
 };
@@ -43,7 +43,7 @@ struct _GtkLabelAccessibleLink
   AtkHyperlink parent;
   
   GtkLabelAccessible *label;
-  gint index;
+  int index;
   gboolean focused;
 };
 
@@ -53,7 +53,7 @@ struct _GtkLabelAccessibleLinkClass
 };
 
 static GtkLabelAccessibleLink *gtk_label_accessible_link_new (GtkLabelAccessible *label,
-                                                              gint                idx);
+                                                              int                 idx);
 
 typedef struct _GtkLabelAccessibleLinkImpl      GtkLabelAccessibleLinkImpl;
 typedef struct _GtkLabelAccessibleLinkImplClass GtkLabelAccessibleLinkImplClass;
@@ -153,7 +153,7 @@ _gtk_label_accessible_link_impl_class_init (GtkLabelAccessibleLinkImplClass *cla
 
 static GtkLabelAccessibleLinkImpl *
 gtk_label_accessible_link_impl_new (GtkLabelAccessible *label,
-                                    gint                idx)
+                                    int                 idx)
 {
   GtkLabelAccessibleLinkImpl *impl;
 
@@ -175,7 +175,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessibleLink, _gtk_label_accessible_link, ATK
 
 static gchar *
 gtk_label_accessible_link_get_uri (AtkHyperlink *atk_link,
-                                   gint          i)
+                                   int           i)
 {
   GtkLabelAccessibleLink *link = (GtkLabelAccessibleLink *)atk_link;
   GtkWidget *widget;
@@ -192,7 +192,7 @@ gtk_label_accessible_link_get_uri (AtkHyperlink *atk_link,
   return g_strdup (uri);
 }
 
-static gint
+static int
 gtk_label_accessible_link_get_n_anchors (AtkHyperlink *atk_link)
 {
   return 1;
@@ -206,7 +206,7 @@ gtk_label_accessible_link_is_valid (AtkHyperlink *atk_link)
 
 static AtkObject *
 gtk_label_accessible_link_get_object (AtkHyperlink *atk_link,
-                                      gint          i)
+                                      int           i)
 {
   GtkLabelAccessibleLink *link = (GtkLabelAccessibleLink *)atk_link;
 
@@ -215,12 +215,12 @@ gtk_label_accessible_link_get_object (AtkHyperlink *atk_link,
   return ATK_OBJECT (link->label);
 }
 
-static gint
+static int
 gtk_label_accessible_link_get_start_index (AtkHyperlink *atk_link)
 {
   GtkLabelAccessibleLink *link = (GtkLabelAccessibleLink *)atk_link;
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   if (link->label == NULL)
     return 0;
@@ -231,12 +231,12 @@ gtk_label_accessible_link_get_start_index (AtkHyperlink *atk_link)
   return start;
 }
 
-static gint
+static int
 gtk_label_accessible_link_get_end_index (AtkHyperlink *atk_link)
 {
   GtkLabelAccessibleLink *link = (GtkLabelAccessibleLink *)atk_link;
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   if (link->label == NULL)
     return 0;
@@ -269,7 +269,7 @@ _gtk_label_accessible_link_class_init (GtkLabelAccessibleLinkClass *class)
 
 static GtkLabelAccessibleLink *
 gtk_label_accessible_link_new (GtkLabelAccessible *label,
-                               gint                idx)
+                               int                 idx)
 {
   GtkLabelAccessibleLink *link;
 
@@ -284,7 +284,7 @@ gtk_label_accessible_link_new (GtkLabelAccessible *label,
 
 static gboolean
 gtk_label_accessible_link_do_action (AtkAction *action,
-                                     gint       i)
+                                     int        i)
 {
   GtkLabelAccessibleLink *link = (GtkLabelAccessibleLink *)action;
   GtkWidget *widget;
@@ -307,7 +307,7 @@ gtk_label_accessible_link_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_label_accessible_link_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -315,7 +315,7 @@ gtk_label_accessible_link_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_label_accessible_link_get_name (AtkAction *action,
-                                    gint       i)
+                                    int        i)
 {
   if (i != 0)
     return NULL;
@@ -380,7 +380,7 @@ check_for_selection_change (GtkLabelAccessible *accessible,
                             GtkLabel           *label)
 {
   gboolean ret_val = FALSE;
-  gint start, end;
+  int start, end;
 
   if (gtk_label_get_selection_bounds (label, &start, &end))
     {
@@ -485,7 +485,7 @@ gtk_label_accessible_get_name (AtkObject *accessible)
     }
 }
 
-static gint
+static int
 gtk_label_accessible_get_n_children (AtkObject *obj)
 {
   GtkLabelAccessible *accessible = GTK_LABEL_ACCESSIBLE (obj);
@@ -495,7 +495,7 @@ gtk_label_accessible_get_n_children (AtkObject *obj)
 
 static AtkObject *
 gtk_label_accessible_ref_child (AtkObject *obj,
-                                gint       idx)
+                                int        idx)
 {
   GtkLabelAccessible *accessible = GTK_LABEL_ACCESSIBLE (obj);
   AtkObject *child;
@@ -612,7 +612,7 @@ static void
 clear_links (GtkLabelAccessible *accessible)
 {
   GList *l;
-  gint i;
+  int i;
   GtkLabelAccessibleLinkImpl *impl;
 
   for (l = accessible->priv->links, i = 0; l; l = l->next, i++)
@@ -630,7 +630,7 @@ static void
 create_links (GtkLabelAccessible *accessible)
 {
   GtkWidget *widget;
-  gint n, i;
+  int n, i;
   GtkLabelAccessibleLinkImpl *impl;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
@@ -688,8 +688,8 @@ _gtk_label_accessible_focus_link_changed (GtkLabel *label)
 
 static gchar*
 gtk_label_accessible_get_text (AtkText *atk_text,
-                               gint     start_pos,
-                               gint     end_pos)
+                               int      start_pos,
+                               int      end_pos)
 {
   GtkWidget *widget;
   const gchar *text;
@@ -722,10 +722,10 @@ gtk_label_accessible_get_text (AtkText *atk_text,
 
 static gchar *
 gtk_label_accessible_get_text_before_offset (AtkText         *text,
-                                             gint             offset,
+                                             int              offset,
                                              AtkTextBoundary  boundary_type,
-                                             gint            *start_offset,
-                                             gint            *end_offset)
+                                             int             *start_offset,
+                                             int             *end_offset)
 {
   GtkWidget *widget;
 
@@ -740,10 +740,10 @@ gtk_label_accessible_get_text_before_offset (AtkText         *text,
 
 static gchar*
 gtk_label_accessible_get_text_at_offset (AtkText         *text,
-                                         gint             offset,
+                                         int              offset,
                                          AtkTextBoundary  boundary_type,
-                                         gint            *start_offset,
-                                         gint            *end_offset)
+                                         int             *start_offset,
+                                         int             *end_offset)
 {
   GtkWidget *widget;
 
@@ -758,10 +758,10 @@ gtk_label_accessible_get_text_at_offset (AtkText         *text,
 
 static gchar*
 gtk_label_accessible_get_text_after_offset (AtkText         *text,
-                                            gint             offset,
+                                            int              offset,
                                             AtkTextBoundary  boundary_type,
-                                            gint            *start_offset,
-                                            gint            *end_offset)
+                                            int             *start_offset,
+                                            int             *end_offset)
 {
   GtkWidget *widget;
 
@@ -774,7 +774,7 @@ gtk_label_accessible_get_text_after_offset (AtkText         *text,
                                     start_offset, end_offset);
 }
 
-static gint
+static int
 gtk_label_accessible_get_character_count (AtkText *atk_text)
 {
   GtkWidget *widget;
@@ -792,7 +792,7 @@ gtk_label_accessible_get_character_count (AtkText *atk_text)
   return 0;
 }
 
-static gint
+static int
 gtk_label_accessible_get_caret_offset (AtkText *text)
 {
   GtkWidget *widget;
@@ -810,7 +810,7 @@ gtk_label_accessible_get_caret_offset (AtkText *text)
 
 static gboolean
 gtk_label_accessible_set_caret_offset (AtkText *text,
-                                       gint     offset)
+                                       int      offset)
 {
   GtkWidget *widget;
   GtkLabel *label;
@@ -829,7 +829,7 @@ gtk_label_accessible_set_caret_offset (AtkText *text,
   return TRUE;
 }
 
-static gint
+static int
 gtk_label_accessible_get_n_selections (AtkText *text)
 {
   GtkWidget *widget;
@@ -846,9 +846,9 @@ gtk_label_accessible_get_n_selections (AtkText *text)
 
 static gchar *
 gtk_label_accessible_get_selection (AtkText *atk_text,
-                                    gint     selection_num,
-                                    gint    *start_pos,
-                                    gint    *end_pos)
+                                    int      selection_num,
+                                    int     *start_pos,
+                                    int     *end_pos)
 {
   GtkWidget *widget;
   GtkLabel  *label;
@@ -877,12 +877,12 @@ gtk_label_accessible_get_selection (AtkText *atk_text,
 
 static gboolean
 gtk_label_accessible_add_selection (AtkText *text,
-                                    gint     start_pos,
-                                    gint     end_pos)
+                                    int      start_pos,
+                                    int      end_pos)
 {
   GtkWidget *widget;
   GtkLabel  *label;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -904,11 +904,11 @@ gtk_label_accessible_add_selection (AtkText *text,
 
 static gboolean
 gtk_label_accessible_remove_selection (AtkText *text,
-                                       gint     selection_num)
+                                       int      selection_num)
 {
   GtkWidget *widget;
   GtkLabel  *label;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -933,13 +933,13 @@ gtk_label_accessible_remove_selection (AtkText *text,
 
 static gboolean
 gtk_label_accessible_set_selection (AtkText *text,
-                                    gint     selection_num,
-                                    gint     start_pos,
-                                    gint     end_pos)
+                                    int      selection_num,
+                                    int      start_pos,
+                                    int      end_pos)
 {
   GtkWidget *widget;
   GtkLabel  *label;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -964,18 +964,18 @@ gtk_label_accessible_set_selection (AtkText *text,
 
 static void
 gtk_label_accessible_get_character_extents (AtkText      *text,
-                                            gint          offset,
-                                            gint         *x,
-                                            gint         *y,
-                                            gint         *width,
-                                            gint         *height,
+                                            int           offset,
+                                            int          *x,
+                                            int          *y,
+                                            int          *width,
+                                            int          *height,
                                             AtkCoordType  coords)
 {
   GtkWidget *widget;
   GtkLabel *label;
   PangoRectangle char_rect;
   const gchar *label_text;
-  gint index, x_layout, y_layout;
+  int index, x_layout, y_layout;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -995,17 +995,17 @@ gtk_label_accessible_get_character_extents (AtkText      *text,
   *height = char_rect.height;
 }
 
-static gint
+static int
 gtk_label_accessible_get_offset_at_point (AtkText      *atk_text,
-                                          gint          x,
-                                          gint          y,
+                                          int           x,
+                                          int           y,
                                           AtkCoordType  coords)
 {
   GtkWidget *widget;
   GtkLabel *label;
   const gchar *text;
-  gint index, x_layout, y_layout;
-  gint x_local, y_local;
+  int index, x_layout, y_layout;
+  int x_local, y_local;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
   if (widget == NULL)
@@ -1054,9 +1054,9 @@ add_attribute (AtkAttributeSet  *attributes,
 
 static AtkAttributeSet*
 gtk_label_accessible_get_run_attributes (AtkText *text,
-                                         gint     offset,
-                                         gint    *start_offset,
-                                         gint    *end_offset)
+                                         int      offset,
+                                         int     *start_offset,
+                                         int     *end_offset)
 {
   GtkWidget *widget;
   AtkAttributeSet *attributes;
@@ -1102,7 +1102,7 @@ gtk_label_accessible_get_default_attributes (AtkText *text)
 
 static gunichar
 gtk_label_accessible_get_character_at_offset (AtkText *atk_text,
-                                              gint     offset)
+                                              int      offset)
 {
   GtkWidget *widget;
   const gchar *text;
@@ -1147,7 +1147,7 @@ atk_text_interface_init (AtkTextIface *iface)
 
 static AtkHyperlink *
 gtk_label_accessible_get_link (AtkHypertext *hypertext,
-                               gint          idx)
+                               int           idx)
 {
   GtkLabelAccessible *label = GTK_LABEL_ACCESSIBLE (hypertext);
   GtkLabelAccessibleLinkImpl *impl;
@@ -1160,7 +1160,7 @@ gtk_label_accessible_get_link (AtkHypertext *hypertext,
   return NULL;
 }
 
-static gint
+static int
 gtk_label_accessible_get_n_links (AtkHypertext *hypertext)
 {
   GtkWidget *widget;
@@ -1170,9 +1170,9 @@ gtk_label_accessible_get_n_links (AtkHypertext *hypertext)
   return _gtk_label_get_n_links (GTK_LABEL (widget));
 }
 
-static gint
+static int
 gtk_label_accessible_get_link_index (AtkHypertext *hypertext,
-                                     gint          char_index)
+                                     int           char_index)
 {
   GtkWidget *widget;
 
index 6953cef85edd85e21877958fe62cfc7447a62b17..1a218940a1f445c3169fe7695f2449a20bd4023c 100644 (file)
@@ -60,7 +60,7 @@ gtk_link_button_accessible_link_new (GtkLinkButtonAccessible *button)
 
 static gchar *
 gtk_link_button_accessible_link_get_uri (AtkHyperlink *atk_link,
-                                         gint          i)
+                                         int           i)
 {
   GtkLinkButtonAccessibleLink *l = (GtkLinkButtonAccessibleLink *)atk_link;
   GtkWidget *widget;
@@ -72,7 +72,7 @@ gtk_link_button_accessible_link_get_uri (AtkHyperlink *atk_link,
   return g_strdup (uri);
 }
 
-static gint
+static int
 gtk_link_button_accessible_link_get_n_anchors (AtkHyperlink *atk_link)
 {
   return 1;
@@ -86,7 +86,7 @@ gtk_link_button_accessible_link_is_valid (AtkHyperlink *atk_link)
 
 static AtkObject *
 gtk_link_button_accessible_link_get_object (AtkHyperlink *atk_link,
-                                            gint          i)
+                                            int           i)
 {
   GtkLinkButtonAccessibleLink *l = (GtkLinkButtonAccessibleLink *)atk_link;
 
@@ -111,7 +111,7 @@ _gtk_link_button_accessible_link_class_init (GtkLinkButtonAccessibleLinkClass *c
 
 static gboolean
 gtk_link_button_accessible_link_do_action (AtkAction *action,
-                                           gint       i)
+                                           int        i)
 {
   GtkLinkButtonAccessibleLink *l = (GtkLinkButtonAccessibleLink *)action;
   GtkWidget *widget;
@@ -131,7 +131,7 @@ gtk_link_button_accessible_link_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_link_button_accessible_link_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -139,7 +139,7 @@ gtk_link_button_accessible_link_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_link_button_accessible_link_get_name (AtkAction *action,
-                                          gint       i)
+                                          int        i)
 {
   if (i != 0)
     return NULL;
index f28581fd701a630fd3a8ebb5566f11a7eb0049b7..6ee7801337ef242640ac7404ca47f07ccd0cabba 100644 (file)
@@ -66,7 +66,7 @@ gtk_list_box_accessible_class_init (GtkListBoxAccessibleClass *klass)
 
 static gboolean
 gtk_list_box_accessible_add_selection (AtkSelection *selection,
-                                       gint          idx)
+                                       int           idx)
 {
   GtkWidget *box;
   GtkListBoxRow *row;
@@ -86,7 +86,7 @@ gtk_list_box_accessible_add_selection (AtkSelection *selection,
 
 static gboolean
 gtk_list_box_accessible_remove_selection (AtkSelection *selection,
-                                          gint          idx)
+                                          int           idx)
 {
   GtkWidget *box;
   GtkListBoxRow *row;
@@ -132,7 +132,7 @@ gtk_list_box_accessible_select_all (AtkSelection *selection)
 
 typedef struct
 {
-  gint idx;
+  int idx;
   GtkWidget *row;
 } FindSelectedData;
 
@@ -154,7 +154,7 @@ find_selected_row (GtkListBox    *box,
 
 static AtkObject *
 gtk_list_box_accessible_ref_selection (AtkSelection *selection,
-                                       gint          idx)
+                                       int           idx)
 {
   GtkWidget *box;
   AtkObject *accessible;
@@ -181,15 +181,15 @@ count_selected (GtkListBox    *box,
                 GtkListBoxRow *row,
                 gpointer       data)
 {
-  gint *count = data;
+  int *count = data;
   *count += 1;
 }
 
-static gint
+static int
 gtk_list_box_accessible_get_selection_count (AtkSelection *selection)
 {
   GtkWidget *box;
-  gint count;
+  int count;
 
   box = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (box == NULL)
@@ -203,7 +203,7 @@ gtk_list_box_accessible_get_selection_count (AtkSelection *selection)
 
 static gboolean
 gtk_list_box_accessible_is_child_selected (AtkSelection *selection,
-                                           gint          idx)
+                                           int           idx)
 {
   GtkWidget *box;
   GtkListBoxRow *row;
index 75482cfc218874cbe0fcf807fe6233a18f074bf7..914fa704f576fecc79b6909648929536f3a61e26 100644 (file)
@@ -33,11 +33,11 @@ gtk_menu_button_accessible_initialize (AtkObject *accessible,
   accessible->role = ATK_ROLE_TOGGLE_BUTTON;
 }
 
-static gint
+static int
 gtk_menu_button_accessible_get_n_children (AtkObject* obj)
 {
   GtkWidget *widget;
-  gint count = 0;
+  int count = 0;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
@@ -48,7 +48,7 @@ gtk_menu_button_accessible_get_n_children (AtkObject* obj)
 
 static AtkObject *
 gtk_menu_button_accessible_ref_child (AtkObject *obj,
-                                      gint       i)
+                                      int        i)
 {
   AtkObject *accessible = NULL;
   GtkWidget *widget;
index 468e2a4206aa4a1fc51d5dda717e3e36719cd4f4..9fb930cd4eb158824879e0c19e30cac18ebf4d13 100644 (file)
@@ -33,7 +33,7 @@ struct _GtkNotebookAccessiblePrivate
    * need to be created
    */
   GHashTable * pages;
-  gint         selected_page;
+  int          selected_page;
 };
 
 static void atk_selection_interface_init (AtkSelectionIface *iface);
@@ -46,7 +46,7 @@ static void
 create_notebook_page_accessible (GtkNotebookAccessible *accessible,
                                  GtkNotebook           *notebook,
                                  GtkWidget             *child,
-                                 gint                   page_num)
+                                 int                    page_num)
 {
   AtkObject *obj;
 
@@ -96,7 +96,7 @@ gtk_notebook_accessible_initialize (AtkObject *obj,
 {
   GtkNotebookAccessible *accessible;
   GtkNotebook *notebook;
-  gint i;
+  int i;
 
   ATK_OBJECT_CLASS (gtk_notebook_accessible_parent_class)->initialize (obj, data);
 
@@ -131,7 +131,7 @@ gtk_notebook_accessible_finalize (GObject *object)
 
 static AtkObject *
 gtk_notebook_accessible_ref_child (AtkObject *obj,
-                                   gint       i)
+                                   int        i)
 {
   AtkObject *child;
   GtkNotebookAccessible *accessible;
@@ -199,7 +199,7 @@ gtk_notebook_accessible_update_page (GtkNotebookAccessible *self,
  */
 static gboolean
 gtk_notebook_accessible_add_selection (AtkSelection *selection,
-                                       gint          i)
+                                       int           i)
 {
   GtkNotebook *notebook;
   GtkWidget *widget;
@@ -238,12 +238,12 @@ gtk_notebook_accessible_init (GtkNotebookAccessible *notebook)
 
 static AtkObject *
 gtk_notebook_accessible_ref_selection (AtkSelection *selection,
-                                       gint          i)
+                                       int           i)
 {
   AtkObject *accessible;
   GtkWidget *widget;
   GtkNotebook *notebook;
-  gint pagenum;
+  int pagenum;
 
   if (i != 0)
     return NULL;
@@ -264,7 +264,7 @@ gtk_notebook_accessible_ref_selection (AtkSelection *selection,
 /* Always return 1 because there can only be one page
  * selected at any time
  */
-static gint
+static int
 gtk_notebook_accessible_get_selection_count (AtkSelection *selection)
 {
   GtkWidget *widget;
@@ -283,11 +283,11 @@ gtk_notebook_accessible_get_selection_count (AtkSelection *selection)
 
 static gboolean
 gtk_notebook_accessible_is_child_selected (AtkSelection *selection,
-                                           gint          i)
+                                           int           i)
 {
   GtkWidget *widget;
   GtkNotebook *notebook;
-  gint pagenumber;
+  int pagenumber;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (widget == NULL)
index 09d089ebe32ce20fa3a38eaf53e4c831a51070f3..dfa199ad51d14bf753078f0e78f0cdfdf18fed64 100644 (file)
@@ -103,7 +103,7 @@ gtk_notebook_page_accessible_get_parent (AtkObject *accessible)
   return ATK_OBJECT (page->priv->notebook);
 }
 
-static gint
+static int
 gtk_notebook_page_accessible_get_n_children (AtkObject *accessible)
 {
   return 1;
@@ -111,7 +111,7 @@ gtk_notebook_page_accessible_get_n_children (AtkObject *accessible)
 
 static AtkObject *
 gtk_notebook_page_accessible_ref_child (AtkObject *accessible,
-                                        gint       i)
+                                        int        i)
 {
   AtkObject *child_obj;
   GtkNotebookPageAccessible *page = NULL;
@@ -185,7 +185,7 @@ gtk_notebook_page_accessible_ref_state_set (AtkObject *accessible)
   return merged_state_set;
 }
 
-static gint
+static int
 gtk_notebook_page_accessible_get_index_in_parent (AtkObject *accessible)
 {
   GtkNotebookPageAccessible *page;
@@ -278,8 +278,8 @@ gtk_notebook_page_accessible_invalidate (GtkNotebookPageAccessible *page)
 
 static AtkObject*
 gtk_notebook_page_accessible_ref_accessible_at_point (AtkComponent *component,
-                                                      gint          x,
-                                                      gint          y,
+                                                      int           x,
+                                                      int           y,
                                                       AtkCoordType  coord_type)
 {
   /* There is only one child so we return it */
@@ -292,10 +292,10 @@ gtk_notebook_page_accessible_ref_accessible_at_point (AtkComponent *component,
 
 static void
 gtk_notebook_page_accessible_get_extents (AtkComponent *component,
-                                          gint         *x,
-                                          gint         *y,
-                                          gint         *width,
-                                          gint         *height,
+                                          int          *x,
+                                          int          *y,
+                                          int          *width,
+                                          int          *height,
                                           AtkCoordType  coord_type)
 {
   GtkWidget *label;
index ba574485d853f4f6bb3d608e8a5b2295a215895e..8d2791166a038698b1ec7af619ffb82318b13d66 100644 (file)
@@ -64,7 +64,7 @@ gtk_paned_accessible_get_current_value (AtkValue *obj,
                                         GValue   *value)
 {
   GtkWidget* widget;
-  gint current_value;
+  int current_value;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
@@ -81,7 +81,7 @@ gtk_paned_accessible_get_maximum_value (AtkValue *obj,
                                         GValue   *value)
 {
   GtkWidget* widget;
-  gint maximum_value;
+  int maximum_value;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
@@ -100,7 +100,7 @@ gtk_paned_accessible_get_minimum_value (AtkValue *obj,
                                         GValue   *value)
 {
   GtkWidget* widget;
-  gint minimum_value;
+  int minimum_value;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
@@ -124,7 +124,7 @@ gtk_paned_accessible_set_current_value (AtkValue     *obj,
                                         const GValue *value)
 {
   GtkWidget* widget;
-  gint new_value;
+  int new_value;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
@@ -160,8 +160,8 @@ static AtkRange *
 gtk_paned_accessible_get_range (AtkValue *obj)
 {
   GtkWidget *widget;
-  gint minimum_value;
-  gint maximum_value;
+  int minimum_value;
+  int maximum_value;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
 
@@ -183,7 +183,7 @@ gtk_paned_accessible_set_value (AtkValue      *obj,
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   paned = GTK_PANED (widget);
 
-  gtk_paned_set_position (paned, (gint)(value + 0.5));
+  gtk_paned_set_position (paned, (int)(value + 0.5));
 }
 
 static void
index 3b3236767fac56c0d28098c0dc44bbfe5c65186a..9cb060ad220e2f9d7010e2e4e6c076fcf805ef08 100644 (file)
@@ -63,7 +63,7 @@ get_text_widget (GtkAccessible *accessible)
 
 static gunichar
 gtk_password_entry_accessible_get_character_at_offset (AtkText *atk_text,
-                                                       gint     offset)
+                                                       int      offset)
 {
   GtkText *text;
   char *contents, *index;
@@ -89,7 +89,7 @@ gtk_password_entry_accessible_get_character_at_offset (AtkText *atk_text,
   return result;
 }
 
-static gint
+static int
 gtk_password_entry_accessible_get_caret_offset (AtkText *atk_text)
 {
   GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
@@ -107,7 +107,7 @@ gtk_password_entry_accessible_get_caret_offset (AtkText *atk_text)
 
 static gboolean
 gtk_password_entry_accessible_set_caret_offset (AtkText *atk_text,
-                                                gint     offset)
+                                                int      offset)
 {
   GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
   if (widget == NULL)
@@ -118,7 +118,7 @@ gtk_password_entry_accessible_set_caret_offset (AtkText *atk_text,
   return TRUE;
 }
 
-static gint
+static int
 gtk_password_entry_accessible_get_character_count (AtkText *atk_text)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
@@ -137,10 +137,10 @@ gtk_password_entry_accessible_get_character_count (AtkText *atk_text)
   return char_count;
 }
 
-static gint
+static int
 gtk_password_entry_accessible_get_offset_at_point (AtkText      *atk_text,
-                                                   gint          x,
-                                                   gint          y,
+                                                   int           x,
+                                                   int           y,
                                                    AtkCoordType  coords)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
@@ -207,8 +207,8 @@ gtk_password_entry_accessible_set_text_contents (AtkEditableText *text,
 static void
 gtk_password_entry_accessible_insert_text (AtkEditableText *text,
                                            const gchar     *string,
-                                           gint             length,
-                                           gint            *position)
+                                           int              length,
+                                           int             *position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -234,8 +234,8 @@ gtk_password_entry_accessible_insert_text (AtkEditableText *text,
 
 static void
 gtk_password_entry_accessible_delete_text (AtkEditableText *text,
-                                           gint             start_pos,
-                                           gint             end_pos)
+                                           int              start_pos,
+                                           int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -278,7 +278,7 @@ paste_received_cb (GObject      *clipboard,
 
 static void
 gtk_password_entry_accessible_paste_text (AtkEditableText *text,
-                                          gint             position)
+                                          int              position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -316,7 +316,7 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface)
 
 static gboolean
 gtk_password_entry_accessible_do_action (AtkAction *action,
-                                         gint       i)
+                                         int        i)
 {
   GtkWidget *widget;
 
@@ -346,7 +346,7 @@ gtk_password_entry_accessible_do_action (AtkAction *action,
   return FALSE;
 }
 
-static gint
+static int
 gtk_password_entry_accessible_get_n_actions (AtkAction *action)
 {
   GtkAccessible *accessible = GTK_ACCESSIBLE (action);
@@ -364,7 +364,7 @@ gtk_password_entry_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_password_entry_accessible_get_keybinding (AtkAction *action,
-                                              gint       i)
+                                              int        i)
 {
   GtkWidget *widget;
   GtkWidget *label;
@@ -409,7 +409,7 @@ gtk_password_entry_accessible_get_keybinding (AtkAction *action,
 
 static const gchar *
 gtk_password_entry_accessible_action_get_name (AtkAction *action,
-                                               gint       i)
+                                               int        i)
 {
   switch (i)
     {
@@ -428,7 +428,7 @@ gtk_password_entry_accessible_action_get_name (AtkAction *action,
 
 static const gchar*
 gtk_password_entry_accessible_action_get_localized_name (AtkAction *action,
-                                                         gint       i)
+                                                         int        i)
 {
   if (i == 0)
     return C_("Action name", "Activate");
@@ -440,7 +440,7 @@ gtk_password_entry_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_password_entry_accessible_action_get_description (AtkAction *action,
-                                                      gint       i)
+                                                      int        i)
 {
   if (i == 0)
     return C_("Action description", "Activates the entry");
@@ -494,7 +494,7 @@ check_for_selection_change (GtkPasswordEntryAccessible *self,
                             GtkEditable                *editable)
 {
   gboolean ret_val = FALSE;
-  gint start, end;
+  int start, end;
 
   if (gtk_editable_get_selection_bounds (editable, &start, &end))
     {
@@ -552,8 +552,8 @@ on_selection_bound_changed (GObject     *gobject,
 static void
 insert_text_cb (GtkEditable                *editable,
                 gchar                      *new_text,
-                gint                        new_text_length,
-                gint                       *position,
+                int                         new_text_length,
+                int                        *position,
                 GtkPasswordEntryAccessible *self)
 {
   int length;
@@ -571,8 +571,8 @@ insert_text_cb (GtkEditable                *editable,
 
 static void
 delete_text_cb (GtkEditable                *editable,
-                gint                        start,
-                gint                        end,
+                int                         start,
+                int                         end,
                 GtkPasswordEntryAccessible *self)
 {
   GtkText *text;
index 9f49eaf8556e3b94eb78a88ea4e1ba49ff1ab3ef..ce8b449557eadf241529833f4938d998e3f4fe0a 100644 (file)
@@ -47,8 +47,8 @@ gtk_picture_accessible_get_image_description (AtkImage *image)
 
 static void
 gtk_picture_accessible_get_image_position (AtkImage     *image,
-                                           gint         *x,
-                                           gint         *y,
+                                           int          *x,
+                                           int          *y,
                                            AtkCoordType  coord_type)
 {
   atk_component_get_extents (ATK_COMPONENT (image), x, y, NULL, NULL,
@@ -57,8 +57,8 @@ gtk_picture_accessible_get_image_position (AtkImage     *image,
 
 static void
 gtk_picture_accessible_get_image_size (AtkImage *image,
-                                       gint     *width,
-                                       gint     *height)
+                                       int      *width,
+                                       int      *height)
 {
   GtkWidget* widget;
   GdkPaintable *paintable;
index df5392bb36fb78dc84e2b3c194842001f05ff84f..4670d14f7a25e58079b0f6a24aa49ecbb837a9a4 100644 (file)
@@ -75,7 +75,7 @@ gtk_radio_button_accessible_ref_relation_set (AtkObject *obj)
         AtkObject **accessible_array;
         guint list_length;
         AtkRelation* relation;
-        gint i = 0;
+        int i = 0;
 
         list_length = g_slist_length (list);
         accessible_array = g_new (AtkObject *, list_length);
index caf8fff4afaa5c3134b3f290b352ed568280eb8e..33e01b2150d6ff8468938366751f5756db133e03 100644 (file)
@@ -128,7 +128,7 @@ gtk_scale_button_accessible_init (GtkScaleButtonAccessible *self)
 
 static gboolean
 gtk_scale_button_accessible_do_action (AtkAction *action,
-                                       gint       i)
+                                       int        i)
 {
   GtkWidget *widget;
 
@@ -152,7 +152,7 @@ gtk_scale_button_accessible_do_action (AtkAction *action,
     }
 }
 
-static gint
+static int
 gtk_scale_button_accessible_get_n_actions (AtkAction *action)
 {
   return 2;
@@ -160,7 +160,7 @@ gtk_scale_button_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_scale_button_accessible_get_description (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   switch (i)
     {
@@ -175,7 +175,7 @@ gtk_scale_button_accessible_get_description (AtkAction *action,
 
 static const gchar *
 gtk_scale_button_accessible_action_get_name (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   switch (i)
     {
@@ -190,7 +190,7 @@ gtk_scale_button_accessible_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_scale_button_accessible_action_get_localized_name (AtkAction *action,
-                                                       gint       i)
+                                                       int        i)
 {
   switch (i)
     {
index fc2822686e56fe5716d03519741905d568f91522..9856f858b2e6609ee64e7c0f9a306c26359d39c7 100644 (file)
@@ -30,8 +30,8 @@ visibility_changed (GObject    *object,
 {
   if (!g_strcmp0 (pspec->name, "visible"))
     {
-      gint index;
-      gint n_children;
+      int index;
+      int n_children;
       gboolean child_added = FALSE;
       AtkObject *child;
       GtkWidget *widget;
@@ -104,7 +104,7 @@ gtk_scrolled_window_accessible_get_n_children (AtkObject *object)
 {
   GtkWidget *widget;
   GtkScrolledWindow *scrolled_window;
-  gint n_children;
+  int n_children;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (object));
   if (widget == NULL)
@@ -125,7 +125,7 @@ gtk_scrolled_window_accessible_get_n_children (AtkObject *object)
 
 static AtkObject *
 gtk_scrolled_window_accessible_ref_child (AtkObject *obj,
-                                          gint       child)
+                                          int        child)
 {
   GtkWidget *widget;
   GtkScrolledWindow *scrolled_window;
index eab4012e53748677d56582367244fa04124f6326..47b23e11671cec2d2d1a5ed9bd9dbb4f937567e1 100644 (file)
@@ -65,7 +65,7 @@ check_for_selection_change (GtkSearchEntryAccessible *self,
                             GtkEditable              *editable)
 {
   gboolean ret_val = FALSE;
-  gint start, end;
+  int start, end;
 
   if (gtk_editable_get_selection_bounds (editable, &start, &end))
     {
@@ -95,8 +95,8 @@ check_for_selection_change (GtkSearchEntryAccessible *self,
 static void
 insert_text_cb (GtkEditable              *editable,
                 gchar                    *new_text,
-                gint                      new_text_length,
-                gint                     *position,
+                int                       new_text_length,
+                int                      *position,
                 GtkSearchEntryAccessible *self)
 {
   int length;
@@ -114,8 +114,8 @@ insert_text_cb (GtkEditable              *editable,
 
 static void
 delete_text_cb (GtkEditable              *editable,
-                gint                      start,
-                gint                      end,
+                int                       start,
+                int                       end,
                 GtkSearchEntryAccessible *self)
 {
   GtkText *text;
@@ -280,8 +280,8 @@ gtk_search_entry_accessible_init (GtkSearchEntryAccessible *self)
 
 static gchar *
 gtk_search_entry_accessible_get_text (AtkText *atk_text,
-                                      gint     start_pos,
-                                      gint     end_pos)
+                                      int      start_pos,
+                                      int      end_pos)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
 
@@ -293,10 +293,10 @@ gtk_search_entry_accessible_get_text (AtkText *atk_text,
 
 static gchar *
 gtk_search_entry_accessible_get_text_before_offset (AtkText         *atk_text,
-                                                    gint             offset,
+                                                    int              offset,
                                                     AtkTextBoundary  boundary_type,
-                                                    gint            *start_offset,
-                                                    gint            *end_offset)
+                                                    int             *start_offset,
+                                                    int             *end_offset)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
 
@@ -310,10 +310,10 @@ gtk_search_entry_accessible_get_text_before_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_search_entry_accessible_get_text_at_offset (AtkText         *atk_text,
-                                                gint             offset,
+                                                int              offset,
                                                 AtkTextBoundary  boundary_type,
-                                                gint            *start_offset,
-                                                gint            *end_offset)
+                                                int             *start_offset,
+                                                int             *end_offset)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
 
@@ -327,10 +327,10 @@ gtk_search_entry_accessible_get_text_at_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_search_entry_accessible_get_text_after_offset (AtkText         *atk_text,
-                                                   gint             offset,
+                                                   int              offset,
                                                    AtkTextBoundary  boundary_type,
-                                                   gint            *start_offset,
-                                                   gint            *end_offset)
+                                                   int             *start_offset,
+                                                   int             *end_offset)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
 
@@ -342,7 +342,7 @@ gtk_search_entry_accessible_get_text_after_offset (AtkText         *atk_text,
                                     start_offset, end_offset);
 }
 
-static gint
+static int
 gtk_search_entry_accessible_get_character_count (AtkText *atk_text)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
@@ -361,7 +361,7 @@ gtk_search_entry_accessible_get_character_count (AtkText *atk_text)
   return char_count;
 }
 
-static gint
+static int
 gtk_search_entry_accessible_get_caret_offset (AtkText *atk_text)
 {
   GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
@@ -379,7 +379,7 @@ gtk_search_entry_accessible_get_caret_offset (AtkText *atk_text)
 
 static gboolean
 gtk_search_entry_accessible_set_caret_offset (AtkText *atk_text,
-                                              gint     offset)
+                                              int      offset)
 {
   GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
   if (widget == NULL)
@@ -393,7 +393,7 @@ gtk_search_entry_accessible_set_caret_offset (AtkText *atk_text,
 static AtkAttributeSet *
 add_text_attribute (AtkAttributeSet  *attributes,
                     AtkTextAttribute  attr,
-                    gint              i)
+                    int               i)
 {
   AtkAttribute *at;
 
@@ -406,9 +406,9 @@ add_text_attribute (AtkAttributeSet  *attributes,
 
 static AtkAttributeSet *
 gtk_search_entry_accessible_get_run_attributes (AtkText *atk_text,
-                                                gint     offset,
-                                                gint    *start_offset,
-                                                gint    *end_offset)
+                                                int      offset,
+                                                int     *start_offset,
+                                                int     *end_offset)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
 
@@ -448,11 +448,11 @@ gtk_search_entry_accessible_get_default_attributes (AtkText *atk_text)
 
 static void
 gtk_search_entry_accessible_get_character_extents (AtkText      *atk_text,
-                                                   gint          offset,
-                                                   gint         *x,
-                                                   gint         *y,
-                                                   gint         *width,
-                                                   gint         *height,
+                                                   int           offset,
+                                                   int          *x,
+                                                   int          *y,
+                                                   int          *width,
+                                                   int          *height,
                                                    AtkCoordType  coords)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
@@ -480,10 +480,10 @@ gtk_search_entry_accessible_get_character_extents (AtkText      *atk_text,
   *height = char_rect.height;
 }
 
-static gint
+static int
 gtk_search_entry_accessible_get_offset_at_point (AtkText      *atk_text,
-                                                 gint          x,
-                                                 gint          y,
+                                                 int           x,
+                                                 int           y,
                                                  AtkCoordType  coords)
 {
   GtkText *text = get_text_widget (GTK_ACCESSIBLE (atk_text));
@@ -521,11 +521,11 @@ gtk_search_entry_accessible_get_offset_at_point (AtkText      *atk_text,
   return offset;
 }
 
-static gint
+static int
 gtk_search_entry_accessible_get_n_selections (AtkText *text)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -539,9 +539,9 @@ gtk_search_entry_accessible_get_n_selections (AtkText *text)
 
 static gchar *
 gtk_search_entry_accessible_get_selection (AtkText *text,
-                                           gint     selection_num,
-                                           gint    *start_pos,
-                                           gint    *end_pos)
+                                           int      selection_num,
+                                           int     *start_pos,
+                                           int     *end_pos)
 {
   GtkEditable *editable;
   GtkWidget *widget;
@@ -570,8 +570,8 @@ gtk_search_entry_accessible_get_selection (AtkText *text,
 
 static gboolean
 gtk_search_entry_accessible_add_selection (AtkText *text,
-                                           gint     start_pos,
-                                           gint     end_pos)
+                                           int      start_pos,
+                                           int      end_pos)
 {
   GtkEntry *entry;
   GtkWidget *widget;
@@ -594,10 +594,10 @@ gtk_search_entry_accessible_add_selection (AtkText *text,
 
 static gboolean
 gtk_search_entry_accessible_remove_selection (AtkText *text,
-                                              gint     selection_num)
+                                              int      selection_num)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -617,12 +617,12 @@ gtk_search_entry_accessible_remove_selection (AtkText *text,
 
 static gboolean
 gtk_search_entry_accessible_set_selection (AtkText *text,
-                                           gint     selection_num,
-                                           gint     start_pos,
-                                           gint     end_pos)
+                                           int      selection_num,
+                                           int      start_pos,
+                                           int      end_pos)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -642,7 +642,7 @@ gtk_search_entry_accessible_set_selection (AtkText *text,
 
 static gunichar
 gtk_search_entry_accessible_get_character_at_offset (AtkText *atk_text,
-                                                     gint     offset)
+                                                     int      offset)
 {
   GtkText *text;
   char *contents;
@@ -710,8 +710,8 @@ gtk_search_entry_accessible_set_text_contents (AtkEditableText *text,
 static void
 gtk_search_entry_accessible_insert_text (AtkEditableText *text,
                                          const gchar     *string,
-                                         gint             length,
-                                         gint            *position)
+                                         int              length,
+                                         int             *position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -737,8 +737,8 @@ gtk_search_entry_accessible_insert_text (AtkEditableText *text,
 
 static void
 gtk_search_entry_accessible_copy_text (AtkEditableText *text,
-                                       gint             start_pos,
-                                       gint             end_pos)
+                                       int              start_pos,
+                                       int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -758,8 +758,8 @@ gtk_search_entry_accessible_copy_text (AtkEditableText *text,
 
 static void
 gtk_search_entry_accessible_cut_text (AtkEditableText *text,
-                                      gint             start_pos,
-                                      gint             end_pos)
+                                      int              start_pos,
+                                      int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -782,8 +782,8 @@ gtk_search_entry_accessible_cut_text (AtkEditableText *text,
 
 static void
 gtk_search_entry_accessible_delete_text (AtkEditableText *text,
-                                         gint             start_pos,
-                                         gint             end_pos)
+                                         int              start_pos,
+                                         int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -826,7 +826,7 @@ paste_received_cb (GObject      *clipboard,
 
 static void
 gtk_search_entry_accessible_paste_text (AtkEditableText *text,
-                                        gint             position)
+                                        int              position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -864,7 +864,7 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface)
 
 static gboolean
 gtk_search_entry_accessible_do_action (AtkAction *action,
-                                       gint       i)
+                                       int        i)
 {
   GtkWidget *widget;
 
@@ -890,7 +890,7 @@ gtk_search_entry_accessible_do_action (AtkAction *action,
   return FALSE;
 }
 
-static gint
+static int
 gtk_search_entry_accessible_get_n_actions (AtkAction *action)
 {
   GtkAccessible *accessible = GTK_ACCESSIBLE (action);
@@ -911,7 +911,7 @@ gtk_search_entry_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_search_entry_accessible_get_keybinding (AtkAction *action,
-                                            gint       i)
+                                            int        i)
 {
   GtkWidget *widget;
   GtkWidget *label;
@@ -956,7 +956,7 @@ gtk_search_entry_accessible_get_keybinding (AtkAction *action,
 
 static const gchar *
 gtk_search_entry_accessible_action_get_name (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   switch (i)
     {
@@ -975,7 +975,7 @@ gtk_search_entry_accessible_action_get_name (AtkAction *action,
 
 static const gchar*
 gtk_search_entry_accessible_action_get_localized_name (AtkAction *action,
-                                                       gint       i)
+                                                       int        i)
 {
   if (i == 0)
     return C_("Action name", "Activate");
@@ -987,7 +987,7 @@ gtk_search_entry_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_search_entry_accessible_action_get_description (AtkAction *action,
-                                                    gint       i)
+                                                    int        i)
 {
   if (i == 0)
     return C_("Action description", "Activates the entry");
index 16b02e2d4f5bb197f493c1825eed87455db321c8..cb055db7ad0220aeb255edf9298dd8bc0c118ac0 100644 (file)
@@ -56,8 +56,8 @@ gtk_spinner_accessible_init (GtkSpinnerAccessible *self)
 
 static void
 gtk_spinner_accessible_image_get_size (AtkImage *image,
-                                       gint     *width,
-                                       gint     *height)
+                                       int      *width,
+                                       int      *height)
 {
   GtkWidget *widget;
 
index b4d2f3850598a5e7454e3b3012edc49ad3c9d2cb..95e2f02c980e269e43e07f7253084e364fcb5f22 100644 (file)
@@ -69,7 +69,7 @@ gtk_statusbar_accessible_get_name (AtkObject *obj)
   return gtk_statusbar_get_message (GTK_STATUSBAR (widget));
 }
 
-static gint
+static int
 gtk_statusbar_accessible_get_n_children (AtkObject *obj)
 {
   return 0;
@@ -77,7 +77,7 @@ gtk_statusbar_accessible_get_n_children (AtkObject *obj)
 
 static AtkObject*
 gtk_statusbar_accessible_ref_child (AtkObject *obj,
-                                    gint       i)
+                                    int        i)
 {
   return NULL;
 }
index 669ba1f3ca20488c52b4644703a2e7162b528b89..985321499f05fd5b469f09bde77adae4f362d9f1 100644 (file)
@@ -66,7 +66,7 @@ gtk_switch_accessible_init (GtkSwitchAccessible *self)
 {
 }
 
-static gint
+static int
 gtk_switch_action_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -74,7 +74,7 @@ gtk_switch_action_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_switch_action_get_name (AtkAction *action,
-                            gint       i)
+                            int        i)
 {
   if (i == 0)
     return "toggle";
@@ -83,7 +83,7 @@ gtk_switch_action_get_name (AtkAction *action,
 
 static const gchar *
 gtk_switch_action_get_localized_name (AtkAction *action,
-                                      gint       i)
+                                      int        i)
 {
   if (i == 0)
     return C_("Action name", "Toggle");
@@ -92,7 +92,7 @@ gtk_switch_action_get_localized_name (AtkAction *action,
 
 static const gchar *
 gtk_switch_action_get_description (AtkAction *action,
-                                   gint       i)
+                                   int        i)
 {
   if (i == 0)
     return C_("Action description", "Toggles the switch");
@@ -101,7 +101,7 @@ gtk_switch_action_get_description (AtkAction *action,
 
 static gboolean
 gtk_switch_action_do_action (AtkAction *action,
-                             gint       i)
+                             int        i)
 {
   GtkSwitch *sw;
   GtkWidget *widget;
index 7a3b396b1acf715c5fe7ce7bbbb66a2a51dc87d7..d71a7869b6134193cf4e67e77181a69218d2c17f 100644 (file)
 
 struct _GtkTextAccessiblePrivate
 {
-  gint cursor_position;
-  gint selection_bound;
+  int cursor_position;
+  int selection_bound;
 };
 
 /* Callbacks */
 
 static void     insert_text_cb             (GtkEditable        *editable,
                                             gchar              *new_text,
-                                            gint                new_text_length,
-                                            gint               *position);
+                                            int                 new_text_length,
+                                            int                *position);
 static void     delete_text_cb             (GtkEditable        *editable,
-                                            gint                start,
-                                            gint                end);
+                                            int                 start,
+                                            int                 end);
 
 static gboolean check_for_selection_change (GtkTextAccessible *entry,
                                             GtkText           *gtk_text);
@@ -171,7 +171,7 @@ gtk_text_accessible_initialize (AtkObject *obj,
 {
   GtkText *entry;
   GtkTextAccessible *gtk_text_accessible;
-  gint start_pos, end_pos;
+  int start_pos, end_pos;
 
   ATK_OBJECT_CLASS (gtk_text_accessible_parent_class)->initialize (obj, data);
 
@@ -197,7 +197,7 @@ gtk_text_accessible_initialize (AtkObject *obj,
     obj->role = ATK_ROLE_PASSWORD_TEXT;
 }
 
-static gint
+static int
 gtk_text_accessible_get_index_in_parent (AtkObject *accessible)
 {
   /* If the parent widget is a combo box then the index is 1
@@ -231,8 +231,8 @@ gtk_text_accessible_init (GtkTextAccessible *entry)
 
 static gchar *
 gtk_text_accessible_get_text (AtkText *atk_text,
-                               gint     start_pos,
-                               gint     end_pos)
+                               int      start_pos,
+                               int      end_pos)
 {
   GtkWidget *widget;
 
@@ -245,10 +245,10 @@ gtk_text_accessible_get_text (AtkText *atk_text,
 
 static gchar *
 gtk_text_accessible_get_text_before_offset (AtkText         *text,
-                                             gint             offset,
+                                             int              offset,
                                              AtkTextBoundary  boundary_type,
-                                             gint            *start_offset,
-                                             gint            *end_offset)
+                                             int             *start_offset,
+                                             int             *end_offset)
 {
   GtkWidget *widget;
 
@@ -263,10 +263,10 @@ gtk_text_accessible_get_text_before_offset (AtkText         *text,
 
 static gchar *
 gtk_text_accessible_get_text_at_offset (AtkText         *text,
-                                         gint             offset,
+                                         int              offset,
                                          AtkTextBoundary  boundary_type,
-                                         gint            *start_offset,
-                                         gint            *end_offset)
+                                         int             *start_offset,
+                                         int             *end_offset)
 {
   GtkWidget *widget;
 
@@ -281,10 +281,10 @@ gtk_text_accessible_get_text_at_offset (AtkText         *text,
 
 static gchar *
 gtk_text_accessible_get_text_after_offset (AtkText         *text,
-                                            gint             offset,
+                                            int              offset,
                                             AtkTextBoundary  boundary_type,
-                                            gint            *start_offset,
-                                            gint            *end_offset)
+                                            int             *start_offset,
+                                            int             *end_offset)
 {
   GtkWidget *widget;
 
@@ -297,7 +297,7 @@ gtk_text_accessible_get_text_after_offset (AtkText         *text,
                                     start_offset, end_offset);
 }
 
-static gint
+static int
 gtk_text_accessible_get_character_count (AtkText *atk_text)
 {
   GtkWidget *widget;
@@ -320,7 +320,7 @@ gtk_text_accessible_get_character_count (AtkText *atk_text)
   return char_count;
 }
 
-static gint
+static int
 gtk_text_accessible_get_caret_offset (AtkText *text)
 {
   GtkWidget *widget;
@@ -340,7 +340,7 @@ gtk_text_accessible_get_caret_offset (AtkText *text)
 
 static gboolean
 gtk_text_accessible_set_caret_offset (AtkText *text,
-                                       gint     offset)
+                                       int      offset)
 {
   GtkWidget *widget;
 
@@ -356,7 +356,7 @@ gtk_text_accessible_set_caret_offset (AtkText *text,
 static AtkAttributeSet *
 add_text_attribute (AtkAttributeSet  *attributes,
                     AtkTextAttribute  attr,
-                    gint              i)
+                    int               i)
 {
   AtkAttribute *at;
 
@@ -369,9 +369,9 @@ add_text_attribute (AtkAttributeSet  *attributes,
 
 static AtkAttributeSet *
 gtk_text_accessible_get_run_attributes (AtkText *text,
-                                         gint     offset,
-                                         gint    *start_offset,
-                                         gint    *end_offset)
+                                         int      offset,
+                                         int     *start_offset,
+                                         int     *end_offset)
 {
   GtkWidget *widget;
   AtkAttributeSet *attributes;
@@ -415,18 +415,18 @@ gtk_text_accessible_get_default_attributes (AtkText *text)
 
 static void
 gtk_text_accessible_get_character_extents (AtkText      *text,
-                                            gint          offset,
-                                            gint         *x,
-                                            gint         *y,
-                                            gint         *width,
-                                            gint         *height,
+                                            int           offset,
+                                            int          *x,
+                                            int          *y,
+                                            int          *width,
+                                            int          *height,
                                             AtkCoordType  coords)
 {
   GtkWidget *widget;
   GtkText *entry;
   PangoRectangle char_rect;
   gchar *entry_text;
-  gint index, x_layout, y_layout;
+  int index, x_layout, y_layout;
   GtkAllocation allocation;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
@@ -451,17 +451,17 @@ gtk_text_accessible_get_character_extents (AtkText      *text,
   *height = char_rect.height;
 }
 
-static gint
+static int
 gtk_text_accessible_get_offset_at_point (AtkText      *atk_text,
-                                          gint          x,
-                                          gint          y,
+                                          int           x,
+                                          int           y,
                                           AtkCoordType  coords)
 {
   GtkWidget *widget;
   GtkText *entry;
   gchar *text;
-  gint index, x_layout, y_layout;
-  gint x_local, y_local;
+  int index, x_layout, y_layout;
+  int x_local, y_local;
   glong offset;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text));
@@ -497,11 +497,11 @@ gtk_text_accessible_get_offset_at_point (AtkText      *atk_text,
   return offset;
 }
 
-static gint
+static int
 gtk_text_accessible_get_n_selections (AtkText *text)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -515,9 +515,9 @@ gtk_text_accessible_get_n_selections (AtkText *text)
 
 static gchar *
 gtk_text_accessible_get_selection (AtkText *text,
-                                    gint     selection_num,
-                                    gint    *start_pos,
-                                    gint    *end_pos)
+                                    int      selection_num,
+                                    int     *start_pos,
+                                    int     *end_pos)
 {
   GtkWidget *widget;
 
@@ -536,12 +536,12 @@ gtk_text_accessible_get_selection (AtkText *text,
 
 static gboolean
 gtk_text_accessible_add_selection (AtkText *text,
-                                    gint     start_pos,
-                                    gint     end_pos)
+                                    int      start_pos,
+                                    int      end_pos)
 {
   GtkText *entry;
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -560,10 +560,10 @@ gtk_text_accessible_add_selection (AtkText *text,
 
 static gboolean
 gtk_text_accessible_remove_selection (AtkText *text,
-                                       gint     selection_num)
+                                       int      selection_num)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -583,12 +583,12 @@ gtk_text_accessible_remove_selection (AtkText *text,
 
 static gboolean
 gtk_text_accessible_set_selection (AtkText *text,
-                                    gint     selection_num,
-                                    gint     start_pos,
-                                    gint     end_pos)
+                                    int      selection_num,
+                                    int      start_pos,
+                                    int      end_pos)
 {
   GtkWidget *widget;
-  gint start, end;
+  int start, end;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text));
   if (widget == NULL)
@@ -608,7 +608,7 @@ gtk_text_accessible_set_selection (AtkText *text,
 
 static gunichar
 gtk_text_accessible_get_character_at_offset (AtkText *atk_text,
-                                              gint     offset)
+                                              int      offset)
 {
   GtkWidget *widget;
   gchar *text;
@@ -676,8 +676,8 @@ gtk_text_accessible_set_text_contents (AtkEditableText *text,
 static void
 gtk_text_accessible_insert_text (AtkEditableText *text,
                                   const gchar     *string,
-                                  gint             length,
-                                  gint            *position)
+                                  int              length,
+                                  int             *position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -696,8 +696,8 @@ gtk_text_accessible_insert_text (AtkEditableText *text,
 
 static void
 gtk_text_accessible_copy_text (AtkEditableText *text,
-                                gint             start_pos,
-                                gint             end_pos)
+                                int              start_pos,
+                                int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -717,8 +717,8 @@ gtk_text_accessible_copy_text (AtkEditableText *text,
 
 static void
 gtk_text_accessible_cut_text (AtkEditableText *text,
-                               gint             start_pos,
-                               gint             end_pos)
+                               int              start_pos,
+                               int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -741,8 +741,8 @@ gtk_text_accessible_cut_text (AtkEditableText *text,
 
 static void
 gtk_text_accessible_delete_text (AtkEditableText *text,
-                                  gint             start_pos,
-                                  gint             end_pos)
+                                  int              start_pos,
+                                  int              end_pos)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -761,7 +761,7 @@ gtk_text_accessible_delete_text (AtkEditableText *text,
 typedef struct
 {
   GtkText* entry;
-  gint position;
+  int position;
 } PasteData;
 
 static void
@@ -784,7 +784,7 @@ paste_received_cb (GObject      *clipboard,
 
 static void
 gtk_text_accessible_paste_text (AtkEditableText *text,
-                                 gint             position)
+                                 int              position)
 {
   GtkWidget *widget;
   GtkEditable *editable;
@@ -823,11 +823,11 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface)
 static void
 insert_text_cb (GtkEditable *editable,
                 gchar       *new_text,
-                gint         new_text_length,
-                gint        *position)
+                int          new_text_length,
+                int         *position)
 {
   GtkTextAccessible *accessible;
-  gint length;
+  int length;
 
   if (new_text_length == 0)
     return;
@@ -848,8 +848,8 @@ insert_text_cb (GtkEditable *editable,
  */
 static void
 delete_text_cb (GtkEditable *editable,
-                gint         start,
-                gint         end)
+                int          start,
+                int          end)
 {
   GtkTextAccessible *accessible;
 
@@ -878,7 +878,7 @@ check_for_selection_change (GtkTextAccessible *accessible,
                             GtkText           *entry)
 {
   gboolean ret_val = FALSE;
-  gint start, end;
+  int start, end;
 
   if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
     {
@@ -907,7 +907,7 @@ check_for_selection_change (GtkTextAccessible *accessible,
 
 static gboolean
 gtk_text_accessible_do_action (AtkAction *action,
-                                gint       i)
+                                int        i)
 {
   GtkWidget *widget;
 
@@ -926,7 +926,7 @@ gtk_text_accessible_do_action (AtkAction *action,
   return TRUE;
 }
 
-static gint
+static int
 gtk_text_accessible_get_n_actions (AtkAction *action)
 {
   return 1;
@@ -934,7 +934,7 @@ gtk_text_accessible_get_n_actions (AtkAction *action)
 
 static const gchar *
 gtk_text_accessible_get_keybinding (AtkAction *action,
-                                     gint       i)
+                                     int        i)
 {
   GtkWidget *widget;
   GtkWidget *label;
@@ -979,7 +979,7 @@ gtk_text_accessible_get_keybinding (AtkAction *action,
 
 static const gchar*
 gtk_text_accessible_action_get_name (AtkAction *action,
-                                      gint       i)
+                                      int        i)
 {
   if (i == 0)
     return "activate";
@@ -988,7 +988,7 @@ gtk_text_accessible_action_get_name (AtkAction *action,
 
 static const gchar*
 gtk_text_accessible_action_get_localized_name (AtkAction *action,
-                                                gint       i)
+                                                int        i)
 {
   if (i == 0)
     return C_("Action name", "Activate");
@@ -997,7 +997,7 @@ gtk_text_accessible_action_get_localized_name (AtkAction *action,
 
 static const gchar*
 gtk_text_accessible_action_get_description (AtkAction *action,
-                                             gint       i)
+                                             int        i)
 {
   if (i == 0)
     return C_("Action description", "Activates the entry");
index ea638743fcfe4da2c94dc0fd81cc9a017312d907..9df1f41a204d0d3a164db9eab453c11d23fc83f3 100644 (file)
@@ -27,8 +27,8 @@
 struct _GtkTextCellAccessiblePrivate
 {
   gchar *cell_text;
-  gint caret_pos;
-  gint cell_length;
+  int caret_pos;
+  int cell_length;
   PangoLayout *layout;
 };
 
@@ -38,45 +38,45 @@ static const gchar* gtk_text_cell_accessible_get_name    (AtkObject      *atk_ob
 /* atktext.h */
 
 static gchar*    gtk_text_cell_accessible_get_text                (AtkText        *text,
-                                                        gint            start_pos,
-                                                        gint            end_pos);
+                                                        int             start_pos,
+                                                        int             end_pos);
 static gunichar gtk_text_cell_accessible_get_character_at_offset  (AtkText        *text,
-                                                         gint           offset);
+                                                         int            offset);
 static gchar*   gtk_text_cell_accessible_get_text_before_offset   (AtkText        *text,
-                                                         gint           offset,
+                                                         int            offset,
                                                          AtkTextBoundary boundary_type,
-                                                         gint           *start_offset,
-                                                         gint           *end_offset);
+                                                         int            *start_offset,
+                                                         int            *end_offset);
 static gchar*   gtk_text_cell_accessible_get_text_at_offset       (AtkText        *text,
-                                                         gint           offset,
+                                                         int            offset,
                                                          AtkTextBoundary boundary_type,
-                                                         gint           *start_offset,
-                                                         gint           *end_offset);
+                                                         int            *start_offset,
+                                                         int            *end_offset);
 static gchar*   gtk_text_cell_accessible_get_text_after_offset    (AtkText        *text,
-                                                         gint           offset,
+                                                         int            offset,
                                                          AtkTextBoundary boundary_type,
-                                                         gint           *start_offset,
-                                                         gint           *end_offset);
-static gint      gtk_text_cell_accessible_get_character_count     (AtkText        *text);
-static gint      gtk_text_cell_accessible_get_caret_offset        (AtkText        *text);
+                                                         int            *start_offset,
+                                                         int            *end_offset);
+static int       gtk_text_cell_accessible_get_character_count     (AtkText        *text);
+static int       gtk_text_cell_accessible_get_caret_offset        (AtkText        *text);
 static gboolean  gtk_text_cell_accessible_set_caret_offset        (AtkText        *text,
-                                                         gint           offset);
+                                                         int            offset);
 static void      gtk_text_cell_accessible_get_character_extents   (AtkText        *text,
-                                                         gint           offset,
-                                                         gint           *x,
-                                                         gint           *y,
-                                                         gint           *width,
-                                                         gint           *height,
+                                                         int            offset,
+                                                         int            *x,
+                                                         int            *y,
+                                                         int            *width,
+                                                         int            *height,
                                                          AtkCoordType   coords);
-static gint      gtk_text_cell_accessible_get_offset_at_point     (AtkText        *text,
-                                                         gint           x,
-                                                         gint           y,
+static int       gtk_text_cell_accessible_get_offset_at_point     (AtkText        *text,
+                                                         int            x,
+                                                         int            y,
                                                          AtkCoordType   coords);
 static AtkAttributeSet* gtk_text_cell_accessible_get_run_attributes 
                                                         (AtkText        *text,
-                                                         gint           offset,
-                                                         gint           *start_offset,      
-                                                         gint           *end_offset); 
+                                                         int            offset,
+                                                         int            *start_offset,      
+                                                         int            *end_offset); 
 static AtkAttributeSet* gtk_text_cell_accessible_get_default_attributes 
                                                         (AtkText        *text);
 
@@ -138,7 +138,7 @@ gtk_text_cell_accessible_update_cache (GtkCellAccessible *cell,
 {
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (cell);
   AtkObject *obj = ATK_OBJECT (cell);
-  gint text_length;
+  int text_length;
   gchar *text;
   GtkCellRenderer *renderer;
 
@@ -203,8 +203,8 @@ gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell)
 
 static gchar *
 gtk_text_cell_accessible_get_text (AtkText *atk_text,
-                                   gint     start_pos,
-                                   gint     end_pos)
+                                   int      start_pos,
+                                   int      end_pos)
 {
   gchar *text;
 
@@ -217,10 +217,10 @@ gtk_text_cell_accessible_get_text (AtkText *atk_text,
 
 static gchar *
 gtk_text_cell_accessible_get_text_before_offset (AtkText         *atk_text,
-                                                 gint             offset,
+                                                 int              offset,
                                                  AtkTextBoundary  boundary_type,
-                                                 gint            *start_offset,
-                                                 gint            *end_offset)
+                                                 int             *start_offset,
+                                                 int             *end_offset)
 {
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_text);
   gchar *text;
@@ -232,10 +232,10 @@ gtk_text_cell_accessible_get_text_before_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_text_cell_accessible_get_text_at_offset (AtkText         *atk_text,
-                                             gint             offset,
+                                             int              offset,
                                              AtkTextBoundary  boundary_type,
-                                             gint            *start_offset,
-                                             gint            *end_offset)
+                                             int             *start_offset,
+                                             int             *end_offset)
 {
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_text);
   gchar *text;
@@ -247,10 +247,10 @@ gtk_text_cell_accessible_get_text_at_offset (AtkText         *atk_text,
 
 static gchar *
 gtk_text_cell_accessible_get_text_after_offset (AtkText         *atk_text,
-                                                gint             offset,
+                                                int              offset,
                                                 AtkTextBoundary  boundary_type,
-                                                gint            *start_offset,
-                                                gint            *end_offset)
+                                                int             *start_offset,
+                                                int             *end_offset)
 {
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_text);
   gchar *text;
@@ -260,7 +260,7 @@ gtk_text_cell_accessible_get_text_after_offset (AtkText         *atk_text,
   return text;
 }
 
-static gint
+static int
 gtk_text_cell_accessible_get_character_count (AtkText *text)
 {
   if (GTK_TEXT_CELL_ACCESSIBLE (text)->priv->cell_text != NULL)
@@ -269,7 +269,7 @@ gtk_text_cell_accessible_get_character_count (AtkText *text)
     return 0;
 }
 
-static gint
+static int
 gtk_text_cell_accessible_get_caret_offset (AtkText *text)
 {
   return GTK_TEXT_CELL_ACCESSIBLE (text)->priv->caret_pos;
@@ -277,7 +277,7 @@ gtk_text_cell_accessible_get_caret_offset (AtkText *text)
 
 static gboolean
 gtk_text_cell_accessible_set_caret_offset (AtkText *text,
-                                           gint     offset)
+                                           int      offset)
 {
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (text);
 
@@ -303,9 +303,9 @@ gtk_text_cell_accessible_set_caret_offset (AtkText *text,
 
 static AtkAttributeSet *
 gtk_text_cell_accessible_get_run_attributes (AtkText *text,
-                                             gint     offset,
-                                             gint    *start_offset,
-                                             gint    *end_offset)
+                                             int      offset,
+                                             int     *start_offset,
+                                             int     *end_offset)
 {
   AtkAttributeSet *attrib_set = NULL;
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (text);
@@ -378,7 +378,7 @@ create_pango_layout (GtkTextCellAccessible *text)
   gboolean scale_set, underline_set, rise_set;
   gchar *renderer_text;
   gdouble scale;
-  gint rise;
+  int rise;
   GtkRendererCellAccessible *gail_renderer;
   GtkCellRendererText *gtk_renderer;
 
@@ -479,11 +479,11 @@ add_attr (PangoAttrList *attr_list,
 
 static void
 gtk_text_cell_accessible_get_character_extents (AtkText      *text,
-                                                gint          offset,
-                                                gint         *x,
-                                                gint         *y,
-                                                gint         *width,
-                                                gint         *height,
+                                                int           offset,
+                                                int          *x,
+                                                int          *y,
+                                                int          *width,
+                                                int          *height,
                                                 AtkCoordType  coords)
 {
   GtkRendererCellAccessible *gail_renderer;
@@ -496,8 +496,8 @@ gtk_text_cell_accessible_get_character_extents (AtkText      *text,
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (text);
   gchar *renderer_text;
   gfloat xalign, yalign;
-  gint x_offset, y_offset, index;
-  gint xpad, ypad;
+  int x_offset, y_offset, index;
+  int xpad, ypad;
 
   if (!GTK_TEXT_CELL_ACCESSIBLE (text)->priv->cell_text)
     {
@@ -559,10 +559,10 @@ gtk_text_cell_accessible_get_character_extents (AtkText      *text,
   g_object_unref (gtk_renderer);
 }
 
-static gint
+static int
 gtk_text_cell_accessible_get_offset_at_point (AtkText      *text,
-                                              gint          x,
-                                              gint          y,
+                                              int           x,
+                                              int           y,
                                               AtkCoordType  coords)
 {
   AtkObject *parent;
@@ -574,9 +574,9 @@ gtk_text_cell_accessible_get_offset_at_point (AtkText      *text,
   GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (text);
   gchar *renderer_text;
   gfloat xalign, yalign;
-  gint x_offset, y_offset, index;
-  gint xpad, ypad;
-  gint x_temp, y_temp;
+  int x_offset, y_offset, index;
+  int xpad, ypad;
+  int x_temp, y_temp;
   gboolean ret;
 
   if (!GTK_TEXT_CELL_ACCESSIBLE (text)->priv->cell_text)
@@ -665,7 +665,7 @@ gtk_text_cell_accessible_get_offset_at_point (AtkText      *text,
 
 static gunichar
 gtk_text_cell_accessible_get_character_at_offset (AtkText *text,
-                                                  gint     offset)
+                                                  int      offset)
 {
   gchar *index;
   gchar *string;
index 9962c23607e346bd22a5b0a82f8bf5462fc20493..a937d88ab5ee9e9ce9b455550b410037b6090a96 100644 (file)
 
 struct _GtkTextViewAccessiblePrivate
 {
-  gint insert_offset;
-  gint selection_bound;
+  int insert_offset;
+  int selection_bound;
 };
 
 static void       insert_text_cb        (GtkTextBuffer    *buffer,
                                                          GtkTextIter      *arg1,
                                                          gchar            *arg2,
-                                                         gint             arg3,
+                                                         int              arg3,
                                                          gpointer         user_data);
 static void       delete_range_cb       (GtkTextBuffer    *buffer,
                                                          GtkTextIter      *arg1,
@@ -180,8 +180,8 @@ gtk_text_view_accessible_init (GtkTextViewAccessible *accessible)
 
 static gchar *
 gtk_text_view_accessible_get_text (AtkText *text,
-                                   gint     start_offset,
-                                   gint     end_offset)
+                                   int      start_offset,
+                                   int      end_offset)
 {
   GtkTextView *view;
   GtkTextBuffer *buffer;
@@ -202,10 +202,10 @@ gtk_text_view_accessible_get_text (AtkText *text,
 
 static gchar *
 gtk_text_view_accessible_get_text_after_offset (AtkText         *text,
-                                                gint             offset,
+                                                int              offset,
                                                 AtkTextBoundary  boundary_type,
-                                                gint            *start_offset,
-                                                gint            *end_offset)
+                                                int             *start_offset,
+                                                int             *end_offset)
 {
   GtkWidget *widget;
   GtkTextView *view;
@@ -245,10 +245,10 @@ gtk_text_view_accessible_get_text_after_offset (AtkText         *text,
 
 static gchar *
 gtk_text_view_accessible_get_text_at_offset (AtkText         *text,
-                                             gint             offset,
+                                             int              offset,
                                              AtkTextBoundary  boundary_type,
-                                             gint            *start_offset,
-                                             gint            *end_offset)
+                                             int             *start_offset,
+                                             int             *end_offset)
 {
   GtkWidget *widget;
   GtkTextView *view;
@@ -290,10 +290,10 @@ gtk_text_view_accessible_get_text_at_offset (AtkText         *text,
 
 static gchar *
 gtk_text_view_accessible_get_text_before_offset (AtkText         *text,
-                                                 gint             offset,
+                                                 int              offset,
                                                  AtkTextBoundary  boundary_type,
-                                                 gint            *start_offset,
-                                                 gint            *end_offset)
+                                                 int             *start_offset,
+                                                 int             *end_offset)
 {
   GtkWidget *widget;
   GtkTextView *view;
@@ -347,7 +347,7 @@ gtk_text_view_accessible_get_text_before_offset (AtkText         *text,
 
 static gunichar
 gtk_text_view_accessible_get_character_at_offset (AtkText *text,
-                                                  gint     offset)
+                                                  int      offset)
 {
   GtkWidget *widget;
   GtkTextIter start, end;
@@ -373,7 +373,7 @@ gtk_text_view_accessible_get_character_at_offset (AtkText *text,
   return unichar;
 }
 
-static gint
+static int
 gtk_text_view_accessible_get_character_count (AtkText *text)
 {
   GtkWidget *widget;
@@ -387,7 +387,7 @@ gtk_text_view_accessible_get_character_count (AtkText *text)
   return gtk_text_buffer_get_char_count (buffer);
 }
 
-static gint
+static int
 get_insert_offset (GtkTextBuffer *buffer)
 {
   GtkTextMark *insert;
@@ -398,7 +398,7 @@ get_insert_offset (GtkTextBuffer *buffer)
   return gtk_text_iter_get_offset (&iter);
 }
 
-static gint
+static int
 gtk_text_view_accessible_get_caret_offset (AtkText *text)
 {
   GtkWidget *widget;
@@ -414,7 +414,7 @@ gtk_text_view_accessible_get_caret_offset (AtkText *text)
 
 static gboolean
 gtk_text_view_accessible_set_caret_offset (AtkText *text,
-                                           gint     offset)
+                                           int      offset)
 {
   GtkTextView *view;
   GtkWidget *widget;
@@ -435,15 +435,15 @@ gtk_text_view_accessible_set_caret_offset (AtkText *text,
   return TRUE;
 }
 
-static gint
+static int
 gtk_text_view_accessible_get_offset_at_point (AtkText      *text,
-                                              gint          x,
-                                              gint          y,
+                                              int           x,
+                                              int           y,
                                               AtkCoordType  coords)
 {
   GtkTextView *view;
   GtkTextIter iter;
-  gint buff_x, buff_y;
+  int buff_x, buff_y;
   GtkWidget *widget;
   GdkRectangle rect;
 
@@ -477,11 +477,11 @@ gtk_text_view_accessible_get_offset_at_point (AtkText      *text,
 
 static void
 gtk_text_view_accessible_get_character_extents (AtkText      *text,
-                                                gint          offset,
-                                                gint         *x,
-                                                gint         *y,
-                                                gint         *width,
-                                                gint         *height,
+                                                int           offset,
+                                                int          *x,
+                                                int          *y,
+                                                int          *width,
+                                                int          *height,
                                                 AtkCoordType  coords)
 {
   GtkTextView *view;
@@ -535,7 +535,7 @@ add_text_attribute (AtkAttributeSet  *attributes,
 static AtkAttributeSet *
 add_text_int_attribute (AtkAttributeSet  *attributes,
                         AtkTextAttribute  attr,
-                        gint              i)
+                        int               i)
 
 {
   gchar *value;
@@ -547,9 +547,9 @@ add_text_int_attribute (AtkAttributeSet  *attributes,
 
 static AtkAttributeSet *
 gtk_text_view_accessible_get_run_attributes (AtkText *text,
-                                             gint     offset,
-                                             gint    *start_offset,
-                                             gint    *end_offset)
+                                             int      offset,
+                                             int     *start_offset,
+                                             int     *end_offset)
 {
   GtkTextView *view;
   GtkTextBuffer *buffer;
@@ -766,7 +766,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
 
       if (val_set)
         {
-          gint weight;
+          int weight;
           gchar *value;
           g_object_get (tag, "weight", &weight, NULL);
           value = g_strdup_printf ("%d", weight);
@@ -811,7 +811,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "size-set", &val_set, NULL);
       if (val_set)
         {
-          gint size;
+          int size;
           gchar *value;
           g_object_get (tag, "size", &size, NULL);
           value = g_strdup_printf ("%i", size);
@@ -861,7 +861,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "rise-set", &val_set, NULL);
       if (val_set)
         {
-          gint rise;
+          int rise;
           gchar *value;
           g_object_get (tag, "rise", &rise, NULL);
           value = g_strdup_printf ("%i", rise);
@@ -895,7 +895,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "pixels-inside-wrap-set", &val_set, NULL);
       if (val_set)
         {
-          gint pixels;
+          int pixels;
           gchar *value;
           g_object_get (tag, "pixels-inside-wrap", &pixels, NULL);
           value = g_strdup_printf ("%i", pixels);
@@ -913,7 +913,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "pixels-below-lines-set", &val_set, NULL);
       if (val_set)
         {
-          gint pixels;
+          int pixels;
           gchar *value;
           g_object_get (tag, "pixels-below-lines", &pixels, NULL);
           value = g_strdup_printf ("%i", pixels);
@@ -931,7 +931,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "pixels-above-lines-set", &val_set, NULL);
       if (val_set)
         {
-          gint pixels;
+          int pixels;
           gchar *value;
           g_object_get (tag, "pixels-above-lines", &pixels, NULL);
           value = g_strdup_printf ("%i", pixels);
@@ -981,7 +981,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "indent-set", &val_set, NULL);
       if (val_set)
         {
-          gint indent;
+          int indent;
           gchar *value;
           g_object_get (tag, "indent", &indent, NULL);
           value = g_strdup_printf ("%i", indent);
@@ -999,7 +999,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "right-margin-set", &val_set, NULL);
       if (val_set)
         {
-          gint margin;
+          int margin;
           gchar *value;
           g_object_get (tag, "right-margin", &margin, NULL);
           value = g_strdup_printf ("%i", margin);
@@ -1017,7 +1017,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text,
       g_object_get (tag, "left-margin-set", &val_set, NULL);
       if (val_set)
         {
-          gint margin;
+          int margin;
           gchar *value;
           g_object_get (tag, "left-margin", &margin, NULL);
           value = g_strdup_printf ("%i", margin);
@@ -1128,7 +1128,7 @@ gtk_text_view_accessible_get_default_attributes (AtkText *text)
   return attributes;
 }
 
-static gint
+static int
 gtk_text_view_accessible_get_n_selections (AtkText *text)
 {
   GtkWidget *widget;
@@ -1147,9 +1147,9 @@ gtk_text_view_accessible_get_n_selections (AtkText *text)
 
 static gchar *
 gtk_text_view_accessible_get_selection (AtkText *atk_text,
-                                        gint     selection_num,
-                                        gint    *start_pos,
-                                        gint    *end_pos)
+                                        int      selection_num,
+                                        int     *start_pos,
+                                        int     *end_pos)
 {
   GtkTextView *view;
   GtkWidget *widget;
@@ -1180,8 +1180,8 @@ gtk_text_view_accessible_get_selection (AtkText *atk_text,
 
 static gboolean
 gtk_text_view_accessible_add_selection (AtkText *text,
-                                        gint     start_pos,
-                                        gint     end_pos)
+                                        int      start_pos,
+                                        int      end_pos)
 {
   GtkWidget *widget;
   GtkTextBuffer *buffer;
@@ -1207,7 +1207,7 @@ gtk_text_view_accessible_add_selection (AtkText *text,
 
 static gboolean
 gtk_text_view_accessible_remove_selection (AtkText *text,
-                                           gint     selection_num)
+                                           int      selection_num)
 {
   GtkWidget *widget;
   GtkTextBuffer *buffer;
@@ -1237,9 +1237,9 @@ gtk_text_view_accessible_remove_selection (AtkText *text,
 
 static gboolean
 gtk_text_view_accessible_set_selection (AtkText *text,
-                                        gint     selection_num,
-                                        gint     start_pos,
-                                        gint     end_pos)
+                                        int      selection_num,
+                                        int      start_pos,
+                                        int      end_pos)
 {
   GtkWidget *widget;
   GtkTextBuffer *buffer;
@@ -1293,8 +1293,8 @@ atk_text_interface_init (AtkTextIface *iface)
 static gboolean
 gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
                                              AtkAttributeSet *attributes,
-                                             gint             start_offset,
-                                             gint             end_offset)
+                                             int              start_offset,
+                                             int              end_offset)
 {
   GtkTextView *view;
   GtkTextBuffer *buffer;
@@ -1302,7 +1302,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text,
   GtkTextTag *tag;
   GtkTextIter start;
   GtkTextIter end;
-  gint j;
+  int j;
   GdkRGBA *color;
   gchar** RGB_vals;
   GSList *l;
@@ -1533,8 +1533,8 @@ gtk_text_view_accessible_set_text_contents (AtkEditableText *text,
 static void
 gtk_text_view_accessible_insert_text (AtkEditableText *text,
                                       const gchar     *string,
-                                      gint             length,
-                                      gint            *position)
+                                      int              length,
+                                      int             *position)
 {
   GtkTextView *view;
   GtkWidget *widget;
@@ -1556,8 +1556,8 @@ gtk_text_view_accessible_insert_text (AtkEditableText *text,
 
 static void
 gtk_text_view_accessible_copy_text (AtkEditableText *text,
-                                    gint             start_pos,
-                                    gint             end_pos)
+                                    int              start_pos,
+                                    int              end_pos)
 {
   GtkWidget *widget;
   GtkTextBuffer *buffer;
@@ -1581,8 +1581,8 @@ gtk_text_view_accessible_copy_text (AtkEditableText *text,
 
 static void
 gtk_text_view_accessible_cut_text (AtkEditableText *text,
-                                   gint             start_pos,
-                                   gint             end_pos)
+                                   int              start_pos,
+                                   int              end_pos)
 {
   GtkTextView *view;
   GtkWidget *widget;
@@ -1610,8 +1610,8 @@ gtk_text_view_accessible_cut_text (AtkEditableText *text,
 
 static void
 gtk_text_view_accessible_delete_text (AtkEditableText *text,
-                                      gint             start_pos,
-                                      gint             end_pos)
+                                      int              start_pos,
+                                      int              end_pos)
 {
   GtkTextView *view;
   GtkWidget *widget;
@@ -1636,7 +1636,7 @@ gtk_text_view_accessible_delete_text (AtkEditableText *text,
 typedef struct
 {
   GtkTextBuffer* buffer;
-  gint position;
+  int position;
 } PasteData;
 
 static void
@@ -1661,7 +1661,7 @@ paste_received (GObject      *clipboard,
 
 static void
 gtk_text_view_accessible_paste_text (AtkEditableText *text,
-                                     gint             position)
+                                     int              position)
 {
   GtkTextView *view;
   GtkWidget *widget;
@@ -1733,12 +1733,12 @@ static void
 insert_text_cb (GtkTextBuffer *buffer,
                 GtkTextIter   *iter,
                 gchar         *text,
-                gint           len,
+                int            len,
                 gpointer       data)
 {
   GtkTextViewAccessible *accessible = data;
-  gint position;
-  gint length;
+  int position;
+  int length;
 
   position = gtk_text_iter_get_offset (iter);
   length = g_utf8_strlen (text, len);
@@ -1755,7 +1755,7 @@ delete_range_cb (GtkTextBuffer *buffer,
                  gpointer       data)
 {
   GtkTextViewAccessible *accessible = data;
-  gint offset, length;
+  int offset, length;
 
   offset = gtk_text_iter_get_offset (start);
   length = gtk_text_iter_get_offset (end) - offset;
index a7d07fec2f785213c3180a1b5d1a7e9a1bd73a2c..f010bea86ee03928329d96b9902ec205d5d4d774 100644 (file)
@@ -55,7 +55,7 @@ gtk_toplevel_accessible_object_finalize (GObject *obj)
   G_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->finalize (obj);
 }
 
-static gint
+static int
 gtk_toplevel_accessible_get_n_children (AtkObject *obj)
 {
   GtkToplevelAccessible *toplevel = GTK_TOPLEVEL_ACCESSIBLE (obj);
@@ -65,7 +65,7 @@ gtk_toplevel_accessible_get_n_children (AtkObject *obj)
 
 static AtkObject *
 gtk_toplevel_accessible_ref_child (AtkObject *obj,
-                                   gint       i)
+                                   int        i)
 {
   GtkToplevelAccessible *toplevel;
   GtkWidget *widget;
@@ -147,7 +147,7 @@ show_event_watcher (GSignalInvocationHint *ihint,
   AtkObject *atk_obj = ATK_OBJECT (toplevel);
   GObject *object;
   GtkWidget *widget;
-  gint n_children;
+  int n_children;
   AtkObject *child;
 
   object = g_value_get_object (param_values + 0);
index 3ea1daca19d5392184cac604fb7e227f9e13b34f..8956dfa1bce79bff88b3c8b5d72d702cc316538d 100644 (file)
@@ -59,11 +59,11 @@ static void             cell_info_new                   (GtkTreeViewAccessible
                                                          GtkTreeRBNode          *node,
                                                          GtkTreeViewColumn      *tv_col,
                                                          GtkCellAccessible      *cell);
-static gint             get_column_number               (GtkTreeView            *tree_view,
+static int              get_column_number               (GtkTreeView            *tree_view,
                                                          GtkTreeViewColumn      *column);
 
 static gboolean         get_rbtree_column_from_index    (GtkTreeView            *tree_view,
-                                                         gint                    index,
+                                                         int                     index,
                                                          GtkTreeRBTree         **tree,
                                                          GtkTreeRBNode         **node,
                                                          GtkTreeViewColumn     **column);
@@ -216,7 +216,7 @@ gtk_tree_view_accessible_widget_unset (GtkAccessible *gtkaccessible)
   GTK_ACCESSIBLE_CLASS (gtk_tree_view_accessible_parent_class)->widget_unset (gtkaccessible);
 }
 
-static gint
+static int
 get_n_rows (GtkTreeView *tree_view)
 {
   GtkTreeRBTree *tree;
@@ -229,7 +229,7 @@ get_n_rows (GtkTreeView *tree_view)
   return tree->root->total_count;
 }
 
-static gint
+static int
 get_n_columns (GtkTreeView *tree_view)
 {
   guint i, visible_columns;
@@ -247,7 +247,7 @@ get_n_columns (GtkTreeView *tree_view)
   return visible_columns;
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_n_children (AtkObject *obj)
 {
   GtkWidget *widget;
@@ -421,7 +421,7 @@ create_cell (GtkTreeView           *treeview,
 
 static AtkObject *
 gtk_tree_view_accessible_ref_child (AtkObject *obj,
-                                    gint       i)
+                                    int        i)
 {
   GtkWidget *widget;
   GtkTreeViewAccessible *accessible;
@@ -502,16 +502,16 @@ gtk_tree_view_accessible_init (GtkTreeViewAccessible *view)
 
 static AtkObject *
 gtk_tree_view_accessible_ref_accessible_at_point (AtkComponent *component,
-                                                  gint          x,
-                                                  gint          y,
+                                                  int           x,
+                                                  int           y,
                                                   AtkCoordType  coord_type)
 {
   GtkWidget *widget;
   GtkTreeView *tree_view;
   GtkTreePath *path;
   GtkTreeViewColumn *column;
-  gint x_pos, y_pos;
-  gint bx, by;
+  int x_pos, y_pos;
+  int bx, by;
   GtkCellAccessible *cell;
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
@@ -550,13 +550,13 @@ atk_component_interface_init (AtkComponentIface *iface)
 
 /* atktable.h */
 
-static gint
+static int
 gtk_tree_view_accessible_get_index_at (AtkTable *table,
-                                       gint      row,
-                                       gint      column)
+                                       int       row,
+                                       int       column)
 {
   GtkWidget *widget;
-  gint n_cols, n_rows;
+  int n_cols, n_rows;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (table));
   if (widget == NULL)
@@ -571,12 +571,12 @@ gtk_tree_view_accessible_get_index_at (AtkTable *table,
   return (row + 1) * n_cols + column;
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_column_at_index (AtkTable *table,
-                                              gint      index)
+                                              int       index)
 {
   GtkWidget *widget;
-  gint n_columns;
+  int n_columns;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (table));
   if (widget == NULL)
@@ -593,9 +593,9 @@ gtk_tree_view_accessible_get_column_at_index (AtkTable *table,
   return index % n_columns;
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_row_at_index (AtkTable *table,
-                                           gint      index)
+                                           int       index)
 {
   GtkWidget *widget;
   GtkTreeView *tree_view;
@@ -616,10 +616,10 @@ gtk_tree_view_accessible_get_row_at_index (AtkTable *table,
 
 static AtkObject *
 gtk_tree_view_accessible_table_ref_at (AtkTable *table,
-                                       gint      row,
-                                       gint      column)
+                                       int       row,
+                                       int       column)
 {
-  gint index;
+  int index;
 
   index = gtk_tree_view_accessible_get_index_at (table, row, column);
   if (index == -1)
@@ -628,7 +628,7 @@ gtk_tree_view_accessible_table_ref_at (AtkTable *table,
   return gtk_tree_view_accessible_ref_child (ATK_OBJECT (table), index);
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_n_rows (AtkTable *table)
 {
   GtkWidget *widget;
@@ -640,7 +640,7 @@ gtk_tree_view_accessible_get_n_rows (AtkTable *table)
   return get_n_rows (GTK_TREE_VIEW (widget));
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_n_columns (AtkTable *table)
 {
   GtkWidget *widget;
@@ -654,7 +654,7 @@ gtk_tree_view_accessible_get_n_columns (AtkTable *table)
 
 static gboolean
 gtk_tree_view_accessible_is_row_selected (AtkTable *table,
-                                          gint      row)
+                                          int       row)
 {
   GtkWidget *widget;
   GtkTreeRBTree *tree;
@@ -678,8 +678,8 @@ gtk_tree_view_accessible_is_row_selected (AtkTable *table,
 
 static gboolean
 gtk_tree_view_accessible_is_selected (AtkTable *table,
-                                      gint      row,
-                                      gint      column)
+                                      int       row,
+                                      int       column)
 {
   return gtk_tree_view_accessible_is_row_selected (table, row);
 }
@@ -712,13 +712,13 @@ get_selected_rows (GtkTreeModel *model,
   g_array_append_val (data->array, id);
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_selected_rows (AtkTable  *table,
-                                            gint     **rows_selected)
+                                            int      **rows_selected)
 {
   SelectedRowsData data;
   GtkWidget *widget;
-  gint n_rows;
+  int n_rows;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (table));
   if (widget == NULL)
@@ -729,7 +729,7 @@ gtk_tree_view_accessible_get_selected_rows (AtkTable  *table,
     }
 
   data.treeview = GTK_TREE_VIEW (widget);
-  data.array = g_array_new (FALSE, FALSE, sizeof (gint));
+  data.array = g_array_new (FALSE, FALSE, sizeof (int));
 
   gtk_tree_selection_selected_foreach (gtk_tree_view_get_selection (data.treeview),
                                        get_selected_rows,
@@ -737,7 +737,7 @@ gtk_tree_view_accessible_get_selected_rows (AtkTable  *table,
 
   n_rows = data.array->len;
   if (rows_selected)
-    *rows_selected = (gint *) g_array_free (data.array, FALSE);
+    *rows_selected = (int *) g_array_free (data.array, FALSE);
   else
     g_array_free (data.array, TRUE);
   
@@ -746,7 +746,7 @@ gtk_tree_view_accessible_get_selected_rows (AtkTable  *table,
 
 static gboolean
 gtk_tree_view_accessible_add_row_selection (AtkTable *table,
-                                            gint      row)
+                                            int       row)
 {
   GtkTreeView *treeview;
   GtkTreePath *path;
@@ -778,7 +778,7 @@ gtk_tree_view_accessible_add_row_selection (AtkTable *table,
 
 static gboolean
 gtk_tree_view_accessible_remove_row_selection (AtkTable *table,
-                                               gint      row)
+                                               int       row)
 {
   GtkTreeView *treeview;
   GtkTreePath *path;
@@ -810,7 +810,7 @@ gtk_tree_view_accessible_remove_row_selection (AtkTable *table,
 
 static AtkObject *
 gtk_tree_view_accessible_get_column_header (AtkTable *table,
-                                            gint      in_col)
+                                            int       in_col)
 {
   GtkWidget *widget;
   GtkTreeView *tree_view;
@@ -830,7 +830,7 @@ gtk_tree_view_accessible_get_column_header (AtkTable *table,
 
 static const gchar *
 gtk_tree_view_accessible_get_column_description (AtkTable *table,
-                                                 gint      in_col)
+                                                 int       in_col)
 {
   GtkWidget *widget;
   GtkTreeView *tree_view;
@@ -872,11 +872,11 @@ atk_table_interface_init (AtkTableIface *iface)
 
 static gboolean
 gtk_tree_view_accessible_add_selection (AtkSelection *selection,
-                                        gint          i)
+                                        int           i)
 {
   AtkTable *table;
-  gint n_columns;
-  gint row;
+  int n_columns;
+  int row;
 
   table = ATK_TABLE (selection);
   n_columns = gtk_tree_view_accessible_get_n_columns (table);
@@ -907,13 +907,13 @@ gtk_tree_view_accessible_clear_selection (AtkSelection *selection)
 
 static AtkObject *
 gtk_tree_view_accessible_ref_selection (AtkSelection *selection,
-                                        gint          i)
+                                        int           i)
 {
   AtkTable *table;
-  gint row;
-  gint n_selected;
-  gint n_columns;
-  gint *selected;
+  int row;
+  int n_selected;
+  int n_columns;
+  int *selected;
 
   table = ATK_TABLE (selection);
   n_columns = gtk_tree_view_accessible_get_n_columns (table);
@@ -927,11 +927,11 @@ gtk_tree_view_accessible_ref_selection (AtkSelection *selection,
   return gtk_tree_view_accessible_table_ref_at (table, row, i % n_columns);
 }
 
-static gint
+static int
 gtk_tree_view_accessible_get_selection_count (AtkSelection *selection)
 {
   AtkTable *table;
-  gint n_selected;
+  int n_selected;
 
   table = ATK_TABLE (selection);
   n_selected = gtk_tree_view_accessible_get_selected_rows (table, NULL);
@@ -942,10 +942,10 @@ gtk_tree_view_accessible_get_selection_count (AtkSelection *selection)
 
 static gboolean
 gtk_tree_view_accessible_is_child_selected (AtkSelection *selection,
-                                            gint          i)
+                                            int           i)
 {
   GtkWidget *widget;
-  gint row;
+  int row;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (selection));
   if (widget == NULL)
@@ -1012,7 +1012,7 @@ gtk_tree_view_accessible_get_cell_area (GtkCellAccessibleParent *parent,
           /* Values from gtktreeview.c ... */
 #define _TREE_VIEW_EXPANDER_SIZE 16
 #define _TREE_VIEW_HORIZONTAL_SEPARATOR 4
-          gint expander_size = _TREE_VIEW_EXPANDER_SIZE + (_TREE_VIEW_HORIZONTAL_SEPARATOR / 2);
+          int expander_size = _TREE_VIEW_EXPANDER_SIZE + (_TREE_VIEW_HORIZONTAL_SEPARATOR / 2);
           cell_rect->x += expander_size + EXTRA_EXPANDER_PADDING;
           cell_rect->width -= expander_size + EXTRA_EXPANDER_PADDING;
         }
@@ -1024,10 +1024,10 @@ gtk_tree_view_accessible_get_cell_area (GtkCellAccessibleParent *parent,
        */
       if (top_cell != cell)
         {
-          gint cell_index;
+          int cell_index;
           gboolean found;
-          gint cell_start;
-          gint cell_width;
+          int cell_start;
+          int cell_width;
           GList *renderers;
           GtkCellRenderer *renderer;
 
@@ -1050,16 +1050,16 @@ gtk_tree_view_accessible_get_cell_area (GtkCellAccessibleParent *parent,
 static void
 gtk_tree_view_accessible_get_cell_extents (GtkCellAccessibleParent *parent,
                                            GtkCellAccessible       *cell,
-                                           gint                    *x,
-                                           gint                    *y,
-                                           gint                    *width,
-                                           gint                    *height,
+                                           int                     *x,
+                                           int                     *y,
+                                           int                     *width,
+                                           int                     *height,
                                            AtkCoordType             coord_type)
 {
   GtkWidget *widget;
   GtkTreeView *tree_view;
   GdkRectangle cell_rect;
-  gint w_x, w_y;
+  int w_x, w_y;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent));
   if (widget == NULL)
@@ -1098,7 +1098,7 @@ gtk_tree_view_accessible_grab_cell_focus (GtkCellAccessibleParent *parent,
   GtkTreeViewAccessibleCellInfo *cell_info;
   GtkCellRenderer *renderer = NULL;
   GtkWidget *toplevel;
-  gint index;
+  int index;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (parent));
   if (widget == NULL)
@@ -1356,8 +1356,8 @@ gtk_tree_view_accessible_update_relationset (GtkCellAccessibleParent *parent,
 static void
 gtk_tree_view_accessible_get_cell_position (GtkCellAccessibleParent *parent,
                                             GtkCellAccessible       *cell,
-                                            gint                    *row,
-                                            gint                    *column)
+                                            int                     *row,
+                                            int                     *column)
 {
   GtkWidget *widget;
   GtkTreeView *tree_view;
@@ -1437,7 +1437,7 @@ is_cell_showing (GtkTreeView  *tree_view,
 {
   GdkRectangle rect, *visible_rect;
   GdkRectangle rect1, *tree_cell_rect;
-  gint bx, by;
+  int bx, by;
   gboolean is_showing;
 
  /* A cell is considered "SHOWING" if any part of the cell is
@@ -1514,7 +1514,7 @@ cell_info_new (GtkTreeViewAccessible *self,
 /* Returns the column number of the specified GtkTreeViewColumn
  * The column must be visible.
  */
-static gint
+static int
 get_column_number (GtkTreeView       *treeview,
                    GtkTreeViewColumn *column)
 {
@@ -1543,7 +1543,7 @@ get_column_number (GtkTreeView       *treeview,
 
 static gboolean
 get_rbtree_column_from_index (GtkTreeView        *tree_view,
-                              gint                index,
+                              int                 index,
                               GtkTreeRBTree     **tree,
                               GtkTreeRBNode     **node,
                               GtkTreeViewColumn **column)
index fe334e3d8b055c8fb4bcd50b952c82221d67ca48..1941952e79ddda4e13e80bb741cb8b25a96e7eb1 100644 (file)
@@ -230,7 +230,7 @@ gtk_widget_accessible_get_parent (AtkObject *accessible)
    */
   if (GTK_IS_NOTEBOOK (parent_widget))
     {
-      gint page_num;
+      int page_num;
       GtkWidget *child;
       GtkNotebook *notebook;
 
@@ -465,12 +465,12 @@ gtk_widget_accessible_ref_state_set (AtkObject *accessible)
   return state_set;
 }
 
-static gint
+static int
 gtk_widget_accessible_get_index_in_parent (AtkObject *accessible)
 {
   GtkWidget *widget;
   GtkWidget *parent_widget;
-  gint index;
+  int index;
   GtkWidget *ch;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
@@ -488,7 +488,7 @@ gtk_widget_accessible_get_index_in_parent (AtkObject *accessible)
         return 0;
       else
         {
-          gint n_children, i;
+          int n_children, i;
           gboolean found = FALSE;
 
           n_children = atk_object_get_n_accessible_children (parent);
@@ -592,10 +592,10 @@ gtk_widget_accessible_init (GtkWidgetAccessible *accessible)
 
 static void
 gtk_widget_accessible_get_extents (AtkComponent   *component,
-                                   gint           *x,
-                                   gint           *y,
-                                   gint           *width,
-                                   gint           *height,
+                                   int            *x,
+                                   int            *y,
+                                   int            *width,
+                                   int            *height,
                                    AtkCoordType    coord_type)
 {
   GtkWidget *widget;
@@ -663,10 +663,10 @@ gtk_widget_accessible_grab_focus (AtkComponent *component)
 
 static gboolean
 gtk_widget_accessible_set_extents (AtkComponent *component,
-                                   gint          x,
-                                   gint          y,
-                                   gint          width,
-                                   gint          height,
+                                   int           x,
+                                   int           y,
+                                   int           width,
+                                   int           height,
                                    AtkCoordType  coord_type)
 {
   return FALSE;
@@ -674,8 +674,8 @@ gtk_widget_accessible_set_extents (AtkComponent *component,
 
 static gboolean
 gtk_widget_accessible_set_position (AtkComponent *component,
-                                    gint          x,
-                                    gint          y,
+                                    int           x,
+                                    int           y,
                                     AtkCoordType  coord_type)
 {
   return FALSE;
@@ -683,8 +683,8 @@ gtk_widget_accessible_set_position (AtkComponent *component,
 
 static gboolean
 gtk_widget_accessible_set_size (AtkComponent *component,
-                                gint          width,
-                                gint          height)
+                                int           width,
+                                int           height)
 {
   return FALSE;
 }
index 6485cf8e69e0778523a804f968ed2b83aa8c0021..594ad6ca577cafc78d197f289cb94dd3ebde590e 100644 (file)
 /* atkcomponent.h */
 
 static void                  gtk_window_accessible_get_extents      (AtkComponent         *component,
-                                                           gint                 *x,
-                                                           gint                 *y,
-                                                           gint                 *width,
-                                                           gint                 *height,
+                                                           int                  *x,
+                                                           int                  *y,
+                                                           int                  *width,
+                                                           int                  *height,
                                                            AtkCoordType         coord_type);
 static void                  gtk_window_accessible_get_size         (AtkComponent         *component,
-                                                           gint                 *width,
-                                                           gint                 *height);
+                                                           int                  *width,
+                                                           int                  *height);
 
 static void atk_component_interface_init (AtkComponentIface *iface);
 static void atk_window_interface_init (AtkWindowIface *iface);
@@ -94,12 +94,12 @@ gtk_window_accessible_get_name (AtkObject *accessible)
   return name;
 }
 
-static gint
+static int
 gtk_window_accessible_get_index_in_parent (AtkObject *accessible)
 {
   GtkWidget* widget;
   AtkObject* atk_obj;
-  gint index = -1;
+  int index = -1;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
   if (widget == NULL)
@@ -121,7 +121,7 @@ gtk_window_accessible_get_index_in_parent (AtkObject *accessible)
         }
       else
         {
-          gint i, sibling_count;
+          int i, sibling_count;
 
           sibling_count = atk_object_get_n_accessible_children (atk_obj);
           for (i = 0; i < sibling_count && index == -1; ++i)
@@ -204,12 +204,12 @@ gtk_window_accessible_ref_state_set (AtkObject *accessible)
   return state_set;
 }
 
-static gint
+static int
 gtk_window_accessible_get_n_children (AtkObject *object)
 {
   GtkWidget *window;
   GtkWidget *child;
-  gint count = 0;
+  int count = 0;
 
   window = gtk_accessible_get_widget (GTK_ACCESSIBLE (object));
   for (child = gtk_widget_get_first_child (GTK_WIDGET (window));
@@ -222,7 +222,7 @@ gtk_window_accessible_get_n_children (AtkObject *object)
 
 static AtkObject *
 gtk_window_accessible_ref_child (AtkObject *object,
-                                 gint       i)
+                                 int        i)
 {
   GtkWidget *window, *child;
   int pos;
@@ -270,10 +270,10 @@ gtk_window_accessible_init (GtkWindowAccessible *accessible)
 
 static void
 gtk_window_accessible_get_extents (AtkComponent  *component,
-                                   gint          *x,
-                                   gint          *y,
-                                   gint          *width,
-                                   gint          *height,
+                                   int           *x,
+                                   int           *y,
+                                   int           *width,
+                                   int           *height,
                                    AtkCoordType   coord_type)
 {
   GtkWidget *widget;
@@ -301,8 +301,8 @@ gtk_window_accessible_get_extents (AtkComponent  *component,
 
 static void
 gtk_window_accessible_get_size (AtkComponent *component,
-                                gint         *width,
-                                gint         *height)
+                                int          *width,
+                                int          *height)
 {
   GtkWidget *widget;
   GdkSurface *surface;
index 02ab970b61050a9b355ba510e209c52f3e773ef1..3bdee6359e2f6373b53af5df6a56040e7d9995ae 100644 (file)
@@ -23,7 +23,7 @@
 
 struct _GtkCssSection
 {
-  gint                ref_count;
+  int                 ref_count;
   GtkCssSection      *parent;
   GFile              *file;
   GtkCssLocation      start_location;
index fa0cb9f0834334a670dd2036f8fa9c3ff8a02eab..754c84ecb1a29b053a4af416b87b80cb87db5e62 100644 (file)
@@ -28,7 +28,7 @@
 
 struct _GtkCssTokenizer
 {
-  gint                   ref_count;
+  int                    ref_count;
   GBytes                *bytes;
 
   const gchar           *data;
index b1023b8fbfedcf1fd2bd646b36e280e151750dd8..afec5796d88712e40311200512916b64325a1ebe 100644 (file)
 
 #include "paper_names.c"
 
-static const gint n_infos = G_N_ELEMENTS (standard_names);
-static const gint n_extra = G_N_ELEMENTS (extra_ppd_names);
+static const int n_infos = G_N_ELEMENTS (standard_names);
+static const int n_extra = G_N_ELEMENTS (extra_ppd_names);
 
 typedef struct {
   const gchar *s;
-  gint         len;
-  gint         suffix;
-  gint         offset;
+  int          len;
+  int          suffix;
+  int          offset;
 } NameInfo;
 
 static NameInfo *names = NULL;
-static gint n_names = 0;
+static int n_names = 0;
 
 static void
 add_name (const gchar *name)
@@ -47,10 +47,10 @@ add_name (const gchar *name)
   n_names++;
 }
 
-static gint
+static int
 find_name (const gchar *name)
 {
-  gint i;
+  int i;
 
   if (!name)
     return -1;
@@ -113,7 +113,7 @@ parse_media_size (const gchar *size,
 int 
 main (int argc, char *argv[])
 {
-  gint i, j, offset;
+  int i, j, offset;
   gdouble width, height;
 
   names = (NameInfo *) malloc (sizeof (NameInfo) * (4 + n_infos + 2 * n_extra));
index 8c64b02a50a750040763989aba9c954fe819f553..d7d69b139c7aca591c1fcacdbac782531199341c 100644 (file)
@@ -48,7 +48,7 @@ g_settings_set_mapping_int (const GValue       *value,
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_INT32))
     {
       if (G_MININT32 <= l && l <= G_MAXINT32)
-        variant = g_variant_new_int32 ((gint) l);
+        variant = g_variant_new_int32 ((int) l);
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT32))
     {
@@ -103,7 +103,7 @@ g_settings_set_mapping_float (const GValue       *value,
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_INT32))
     {
       if (G_MININT32 <= l && l <= G_MAXINT32)
-        variant = g_variant_new_int32 ((gint) l);
+        variant = g_variant_new_int32 ((int) l);
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT32))
     {
@@ -157,7 +157,7 @@ g_settings_set_mapping_unsigned_int (const GValue       *value,
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_INT32))
     {
       if (u <= G_MAXINT32)
-        variant = g_variant_new_int32 ((gint) u);
+        variant = g_variant_new_int32 ((int) u);
     }
   else if (g_variant_type_equal (expected_type, G_VARIANT_TYPE_UINT32))
     {
index 473cf71b46b93795c86d70c7d2c407d32b4e5edb..7aa62b5072ff95e6d4ca0fcbec8a1356344e2be7 100644 (file)
@@ -249,8 +249,8 @@ static void                 follow_if_link                  (GtkAboutDialog
                                                              GtkTextIter        *iter);
 static void                 set_cursor_if_appropriate       (GtkAboutDialog     *about,
                                                              GtkTextView        *text_view,
-                                                             gint                x,
-                                                             gint                y);
+                                                             int                 x,
+                                                             int                 y);
 static void                 populate_credits_page           (GtkAboutDialog     *about);
 static void                 populate_license_page           (GtkAboutDialog     *about);
 static void                 populate_system_page            (GtkAboutDialog     *about);
@@ -1728,8 +1728,8 @@ gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about,
   if (icon_name)
     {
       GtkIconTheme *icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (about)));
-      gint *sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_name);
-      gint i, best_size = 0;
+      int *sizes = gtk_icon_theme_get_icon_sizes (icon_theme, icon_name);
+      int i, best_size = 0;
 
       for (i = 0; sizes[i]; i++)
         {
@@ -1842,7 +1842,7 @@ text_view_released (GtkGestureClick *gesture,
   GtkWidget *text_view;
   GtkTextIter start, end, iter;
   GtkTextBuffer *buffer;
-  gint tx, ty;
+  int tx, ty;
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) != GDK_BUTTON_PRIMARY)
     return;
@@ -1867,8 +1867,8 @@ text_view_released (GtkGestureClick *gesture,
 static void
 set_cursor_if_appropriate (GtkAboutDialog *about,
                            GtkTextView    *text_view,
-                           gint            x,
-                           gint            y)
+                           int             x,
+                           int             y)
 {
   GSList *tags = NULL, *tagp = NULL;
   GtkTextIter iter;
@@ -1908,7 +1908,7 @@ text_view_motion (GtkEventControllerMotion *motion,
                   double                    y,
                   GtkAboutDialog           *about)
 {
-  gint tx, ty;
+  int tx, ty;
   GtkWidget *widget;
 
   widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (motion));
@@ -2045,7 +2045,7 @@ text_buffer_new (GtkAboutDialog  *about,
 static void
 add_credits_section (GtkAboutDialog  *about,
                      GtkGrid         *grid,
-                     gint            *row,
+                     int             *row,
                      gchar           *title,
                      gchar          **people)
 {
@@ -2173,7 +2173,7 @@ add_credits_section (GtkAboutDialog  *about,
 static void
 populate_credits_page (GtkAboutDialog *about)
 {
-  gint row;
+  int row;
 
   row = 0;
 
index 2a861d23d61c9482a7214ab8efba8bd91ddb8139..0e45b3635a709e587078648253a51ab4bb13a805 100644 (file)
@@ -275,7 +275,7 @@ gtk_accelerator_parse_with_keycode (const gchar     *accelerator,
 {
   guint keyval;
   GdkModifierType mods;
-  gint len;
+  int len;
   gboolean error;
 
   if (accelerator_key)
@@ -377,7 +377,7 @@ gtk_accelerator_parse_with_keycode (const gchar     *accelerator,
             {
                char keystring[5];
                gchar *endptr;
-               gint tmp_keycode;
+               int tmp_keycode;
 
                memcpy (keystring, accelerator, 4);
                keystring [4] = '\000';
@@ -424,7 +424,7 @@ gtk_accelerator_parse_with_keycode (const gchar     *accelerator,
           if (keyval && accelerator_codes != NULL)
             {
               GdkKeymapKey *keys;
-              gint n_keys, i, j;
+              int n_keys, i, j;
 
               if (!gdk_display_map_keyval (display, keyval, &keys, &n_keys))
                 {
index 7de1740dc5aa6a20868ad26707c3bcafb3d3d7db..99a0b796d5a0b6d00d0ce46a7339d22ae7e46c09 100644 (file)
@@ -70,7 +70,7 @@ struct _GtkActionHelper
 
   GtkButtonRole role;
 
-  gint reporting;
+  int reporting;
 };
 
 enum
index 31800680c2ac4def9985672ce26fcb25fcecd2d0..2ad00251ad665a41f91befd99d5ec62e3a9ae9a4 100644 (file)
@@ -990,7 +990,7 @@ static void
 gtk_action_muxer_free_group (gpointer data)
 {
   Group *group = data;
-  gint i;
+  int i;
 
   /* 'for loop' or 'four loop'? */
   for (i = 0; i < 4; i++)
@@ -1230,7 +1230,7 @@ gtk_action_muxer_insert (GtkActionMuxer *muxer,
 {
   gchar **actions;
   Group *group;
-  gint i;
+  int i;
 
   /* TODO: diff instead of ripout and replace */
   gtk_action_muxer_remove (muxer, prefix);
@@ -1284,7 +1284,7 @@ gtk_action_muxer_remove (GtkActionMuxer *muxer,
   if (group != NULL)
     {
       gchar **actions;
-      gint i;
+      int i;
 
       g_hash_table_steal (muxer->groups, prefix);
 
index c25ceb3f9b383eb675bdf2867720fc6b14e3c54c..097a7bac1494603b73038e5add5cc8e6e85d774e 100644 (file)
@@ -335,7 +335,7 @@ gtk_adjustment_dispatch_properties_changed (GObject     *object,
                                             GParamSpec **pspecs)
 {
   gboolean changed = FALSE;
-  gint i;
+  int i;
 
   G_OBJECT_CLASS (gtk_adjustment_parent_class)->dispatch_properties_changed (object, n_pspecs, pspecs);
 
index 96559596eeec72deebf8a00d13dc7b229262dec2..e86873f14d113c2628987d2c91fd1f902c47a367 100644 (file)
@@ -117,7 +117,7 @@ struct _GtkAppChooserButton {
 
   gchar *content_type;
   gchar *heading;
-  gint last_active;
+  int last_active;
   gboolean show_dialog_item;
   gboolean show_default_item;
   gboolean modal;
@@ -172,7 +172,7 @@ get_first_iter (GtkListStore *store,
 typedef struct {
   GtkAppChooserButton *self;
   GAppInfo *info;
-  gint active_index;
+  int active_index;
 } SelectAppData;
 
 static void
@@ -238,7 +238,7 @@ gtk_app_chooser_button_select_application (GtkAppChooserButton *self,
 
 static void
 other_application_dialog_response_cb (GtkDialog *dialog,
-                                      gint       response_id,
+                                      int        response_id,
                                       gpointer   user_data)
 {
   GtkAppChooserButton *self = user_data;
index 3a6d5a97e35d21d023f9cf8af5cb027e80d31709..3444af11741a5211898e54cb77f4a92452c61542 100644 (file)
@@ -124,7 +124,7 @@ add_or_find_application (GtkAppChooserDialog *self)
 
 static void
 gtk_app_chooser_dialog_response (GtkDialog *dialog,
-                                 gint       response_id,
+                                 int        response_id,
                                  gpointer   user_data)
 {
   GtkAppChooserDialog *self = GTK_APP_CHOOSER_DIALOG (dialog);
index 2f790c72c959de1b81e95bc5fb7b3418a4b5bc30..746fcf75d716cccd1d309aaad90e1b4b8fc5ae6c 100644 (file)
@@ -230,7 +230,7 @@ program_list_selection_activated (GtkTreeView       *view,
 
 static gboolean
 gtk_app_chooser_search_equal_func (GtkTreeModel *model,
-                                   gint          column,
+                                   int           column,
                                    const gchar  *key,
                                    GtkTreeIter  *iter,
                                    gpointer      user_data)
@@ -263,7 +263,7 @@ gtk_app_chooser_search_equal_func (GtkTreeModel *model,
     }
 }
 
-static gint
+static int
 gtk_app_chooser_sort_func (GtkTreeModel *model,
                            GtkTreeIter  *a,
                            GtkTreeIter  *b,
@@ -274,7 +274,7 @@ gtk_app_chooser_sort_func (GtkTreeModel *model,
   gboolean a_heading, b_heading;
   gboolean a_default, b_default;
   gchar *a_name, *b_name, *a_casefold, *b_casefold;
-  gint retval = 0;
+  int retval = 0;
 
   /* this returns:
    * - <0 if a should show before b
@@ -415,7 +415,7 @@ gtk_app_chooser_selection_func (GtkTreeSelection *selection,
   return !heading;
 }
 
-static gint
+static int
 compare_apps_func (gconstpointer a,
                    gconstpointer b)
 {
index a58112a503d1c11be7ec9f11ce8effd6aa66c373..99e7d0c832e8f52027e2704334282481389421ea 100644 (file)
@@ -593,7 +593,7 @@ gtk_application_impl_dbus_publish_menu (GtkApplicationImplDBus  *dbus,
                                         guint                   *id,
                                         gchar                  **path)
 {
-  gint i;
+  int i;
 
   if (dbus->session == NULL)
     return;
index 9b72b8e3c2968847cf151e12ac90b9bd01f0fe27..2f6402a044c80f94b946118c7c44a29d49733156 100644 (file)
@@ -107,7 +107,7 @@ icon_loaded (GObject      *object,
   GNSMenuItem *item = user_data;
   GError *error = NULL;
   GdkPixbuf *pixbuf;
-  gint scale = 1;
+  int scale = 1;
 
 #ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
        /* we need a run-time check for the backingScaleFactor selector because we
@@ -279,7 +279,7 @@ icon_loaded (GObject      *object,
 
       GtkIconTheme *theme;
       GtkIconPaintable *icon;
-      gint scale = 1;
+      int scale = 1;
 
       if (!parsed)
         {
@@ -380,7 +380,7 @@ icon_loaded (GObject      *object,
 
 static void
 menu_item_inserted (GtkMenuTrackerItem *item,
-                    gint                position,
+                    int                 position,
                     gpointer            user_data)
 {
   GNSMenu *menu = user_data;
@@ -389,7 +389,7 @@ menu_item_inserted (GtkMenuTrackerItem *item,
 }
 
 static void
-menu_item_removed (gint     position,
+menu_item_removed (int      position,
                    gpointer user_data)
 {
   GNSMenu *menu = user_data;
index d59a19b1e2c86934f0542991cdd9775444ee826d..f80497f547c1115be78896dd44c8f6aad75bddd9 100644 (file)
@@ -50,7 +50,7 @@ typedef struct
   GMenu *combined;
 
   GSList *inhibitors;
-  gint quit_inhibit;
+  int quit_inhibit;
   guint next_cookie;
   NSObject *delegate;
 } GtkApplicationImplQuartz;
@@ -89,7 +89,7 @@ G_DEFINE_TYPE (GtkApplicationImplQuartz, gtk_application_impl_quartz, GTK_TYPE_A
 -(void)application:(NSApplication *)theApplication openFiles:(NSArray *)filenames
 {
   GFile **files;
-  gint i;
+  int i;
   GApplicationFlags flags;
 
   flags = g_application_get_flags (G_APPLICATION (quartz->impl.application));
index 357491a9eb5fda8fb464da048c0b066dfaace8ea..d736e34a8b973ceaddacb23fb123e025ea9d5ad5 100644 (file)
@@ -296,7 +296,7 @@ gtk_application_shutdown (GApplication *g_application)
 static gboolean
 gtk_application_local_command_line (GApplication   *application,
                                     gchar        ***arguments,
-                                    gint           *exit_status)
+                                    int            *exit_status)
 {
   return G_APPLICATION_CLASS (gtk_application_parent_class)->local_command_line (application, arguments, exit_status);
 }
index 07dc9ba8121b1e2c77bce395dc2ddab25e68c772..bc711301e2fbbfced52bcfbeb134e56f112b2569 100644 (file)
@@ -465,7 +465,7 @@ gtk_application_window_real_size_allocate (GtkWidget *widget,
     {
       GtkAllocation menubar_allocation;
       GtkAllocation child_allocation;
-      gint menubar_height;
+      int menubar_height;
       GtkWidget *child;
 
       _gtk_window_set_allocation (GTK_WINDOW (widget), width, height, &child_allocation);
index c5da70241666cafc87f6f317b82c9d37d3cda807..af8365a1c51550dc520d805541ba418db805d767 100644 (file)
@@ -125,7 +125,7 @@ struct _GtkAssistant
   GtkWidget *content;
   GtkWidget *action_area;
   GtkWidget *headerbar;
-  gint use_header_bar;
+  int use_header_bar;
   gboolean constructed;
 
   GList     *pages;
@@ -141,7 +141,7 @@ struct _GtkAssistant
 
   GListModel *model;
 
-  gint extra_buttons;
+  int extra_buttons;
 
   guint committed : 1;
 };
@@ -204,7 +204,7 @@ static void     on_assistant_last                        (GtkWidget          *wi
 
 static int        gtk_assistant_add_page                 (GtkAssistant     *assistant,
                                                           GtkAssistantPage *page_info,
-                                                          gint              position);
+                                                          int               position);
 
 GType             _gtk_assistant_accessible_get_type     (void);
 
@@ -320,7 +320,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkAssistant, gtk_assistant, GTK_TYPE_WINDOW,
 
 static void
 set_use_header_bar (GtkAssistant *assistant,
-                    gint          use_header_bar)
+                    int           use_header_bar)
 {
   if (use_header_bar == -1)
     return;
@@ -633,8 +633,8 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_last);
 }
 
-static gint
-default_forward_function (gint current_page, gpointer data)
+static int
+default_forward_function (int current_page, gpointer data)
 {
   GtkAssistant *assistant = GTK_ASSISTANT (data);
   GtkAssistantPage *page_info;
@@ -663,7 +663,7 @@ static gboolean
 last_button_visible (GtkAssistant *assistant, GtkAssistantPage *page)
 {
   GtkAssistantPage *page_info;
-  gint count, page_num, n_pages;
+  int count, page_num, n_pages;
 
   if (page == NULL)
     return FALSE;
@@ -703,7 +703,7 @@ update_actions_size (GtkAssistant *assistant)
 {
   GList *l;
   GtkAssistantPage *page;
-  gint buttons, page_buttons;
+  int buttons, page_buttons;
 
   if (!assistant->current_page)
     return;
@@ -749,7 +749,7 @@ compute_last_button_state (GtkAssistant *assistant)
 static void
 compute_progress_state (GtkAssistant *assistant)
 {
-  gint page_num, n_pages;
+  int page_num, n_pages;
 
   n_pages = gtk_assistant_get_n_pages (assistant);
   page_num = gtk_assistant_get_current_page (assistant);
@@ -919,7 +919,7 @@ update_title_state (GtkAssistant *assistant)
 
 static void
 set_current_page (GtkAssistant *assistant,
-                  gint          page_num)
+                  int           page_num)
 {
   assistant->current_page = (GtkAssistantPage *)g_list_nth_data (assistant->pages, page_num);
 
@@ -942,7 +942,7 @@ set_current_page (GtkAssistant *assistant,
   if (!gtk_widget_child_focus (assistant->current_page->page, GTK_DIR_TAB_FORWARD))
     {
       GtkWidget *button[6];
-      gint i;
+      int i;
 
       /* find the best button to focus */
       button[0] = assistant->apply;
@@ -963,11 +963,11 @@ set_current_page (GtkAssistant *assistant,
     }
 }
 
-static gint
+static int
 compute_next_step (GtkAssistant *assistant)
 {
   GtkAssistantPage *page_info;
-  gint current_page, n_pages, next_page;
+  int current_page, n_pages, next_page;
 
   current_page = gtk_assistant_get_current_page (assistant);
   page_info = assistant->current_page;
@@ -1348,7 +1348,7 @@ gtk_assistant_map (GtkWidget *widget)
   GtkAssistant *assistant = GTK_ASSISTANT (widget);
   GList *page_node;
   GtkAssistantPage *page;
-  gint page_num;
+  int page_num;
 
   /* if there's no default page, pick the first one */
   page = NULL;
@@ -1430,7 +1430,7 @@ gtk_assistant_new (void)
  *     page in the @assistant, or -1 if the @assistant has no pages,
  *     or no current page.
  */
-gint
+int
 gtk_assistant_get_current_page (GtkAssistant *assistant)
 {
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), -1);
@@ -1457,7 +1457,7 @@ gtk_assistant_get_current_page (GtkAssistant *assistant)
  */
 void
 gtk_assistant_set_current_page (GtkAssistant *assistant,
-                                gint          page_num)
+                                int           page_num)
 {
   GtkAssistantPage *page;
 
@@ -1555,7 +1555,7 @@ gtk_assistant_previous_page (GtkAssistant *assistant)
  *
  * Returns: the number of pages in the @assistant
  */
-gint
+int
 gtk_assistant_get_n_pages (GtkAssistant *assistant)
 {
   g_return_val_if_fail (GTK_IS_ASSISTANT (assistant), 0);
@@ -1576,7 +1576,7 @@ gtk_assistant_get_n_pages (GtkAssistant *assistant)
  */
 GtkWidget*
 gtk_assistant_get_nth_page (GtkAssistant *assistant,
-                            gint          page_num)
+                            int           page_num)
 {
   GtkAssistantPage *page;
   GList *elem;
@@ -1606,7 +1606,7 @@ gtk_assistant_get_nth_page (GtkAssistant *assistant,
  *
  * Returns: the index (starting at 0) of the inserted page
  */
-gint
+int
 gtk_assistant_prepend_page (GtkAssistant *assistant,
                             GtkWidget    *page)
 {
@@ -1625,7 +1625,7 @@ gtk_assistant_prepend_page (GtkAssistant *assistant,
  *
  * Returns: the index (starting at 0) of the inserted page
  */
-gint
+int
 gtk_assistant_append_page (GtkAssistant *assistant,
                            GtkWidget    *page)
 {
@@ -1646,10 +1646,10 @@ gtk_assistant_append_page (GtkAssistant *assistant,
  *
  * Returns: the index (starting from 0) of the inserted page
  */
-gint
+int
 gtk_assistant_insert_page (GtkAssistant *assistant,
                            GtkWidget    *page,
-                           gint          position)
+                           int           position)
 {
   GtkAssistantPage *page_info;
 
@@ -1668,9 +1668,9 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
 static int
 gtk_assistant_add_page (GtkAssistant *assistant,
                         GtkAssistantPage *page_info,
-                        gint position)
+                        int position)
 {
-  gint n_pages;
+  int n_pages;
   GtkWidget *sibling;
   char *name;
 
@@ -1743,7 +1743,7 @@ gtk_assistant_add_page (GtkAssistant *assistant,
  */
 void
 gtk_assistant_remove_page (GtkAssistant *assistant,
-                           gint          page_num)
+                           int           page_num)
 {
   GtkWidget *page;
 
@@ -2100,7 +2100,7 @@ typedef GtkWindowAccessibleClass GtkAssistantAccessibleClass;
 
 G_DEFINE_TYPE (GtkAssistantAccessible, _gtk_assistant_accessible, GTK_TYPE_WINDOW_ACCESSIBLE);
 
-static gint
+static int
 gtk_assistant_accessible_get_n_children (AtkObject *accessible)
 {
   GtkWidget *widget;
@@ -2116,11 +2116,11 @@ gtk_assistant_accessible_get_n_children (AtkObject *accessible)
 
 static AtkObject *
 gtk_assistant_accessible_ref_child (AtkObject *accessible,
-                                    gint       index)
+                                    int        index)
 {
   GtkAssistant *assistant;
   GtkWidget *widget, *child;
-  gint n_pages;
+  int n_pages;
   AtkObject *obj;
   const gchar *title;
 
index 16ed2d7b16d2132650556677453bdc29ba088583..753703f93c00d85f4d1a06ad0e7e7d98fedc4cf4 100644 (file)
@@ -94,7 +94,7 @@ typedef struct _GtkAssistantPage GtkAssistantPage;
  *
  * Returns: The next page number.
  */
-typedef gint (*GtkAssistantPageFunc) (gint current_page, gpointer data);
+typedef int (*GtkAssistantPageFunc) (int current_page, gpointer data);
 
 GDK_AVAILABLE_IN_ALL
 GType                 gtk_assistant_page_get_type         (void) G_GNUC_CONST;
@@ -107,28 +107,28 @@ void                  gtk_assistant_next_page             (GtkAssistant
 GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_previous_page         (GtkAssistant         *assistant);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_assistant_get_current_page      (GtkAssistant         *assistant);
+int                   gtk_assistant_get_current_page      (GtkAssistant         *assistant);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_current_page      (GtkAssistant         *assistant,
-                                                           gint                  page_num);
+                                                           int                   page_num);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
+int                   gtk_assistant_get_n_pages           (GtkAssistant         *assistant);
 GDK_AVAILABLE_IN_ALL
 GtkWidget            *gtk_assistant_get_nth_page          (GtkAssistant         *assistant,
-                                                           gint                  page_num);
+                                                           int                   page_num);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_assistant_prepend_page          (GtkAssistant         *assistant,
+int                   gtk_assistant_prepend_page          (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_assistant_append_page           (GtkAssistant         *assistant,
+int                   gtk_assistant_append_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_assistant_insert_page           (GtkAssistant         *assistant,
+int                   gtk_assistant_insert_page           (GtkAssistant         *assistant,
                                                            GtkWidget            *page,
-                                                           gint                  position);
+                                                           int                   position);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_remove_page           (GtkAssistant         *assistant,
-                                                           gint                  page_num);
+                                                           int                   page_num);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
                                                            GtkAssistantPageFunc  page_func,
index a944e9129488ad28c2dbeac050da18e40c383186..42ec6b1296315aacb332dcf9bd5d26d25384776d 100644 (file)
@@ -89,7 +89,7 @@ parse_bookmarks (const char *contents)
 {
   gchar **lines, *space;
   GSList *bookmarks = NULL;
-  gint i;
+  int i;
 
   lines = g_strsplit (contents, "\n", -1);
 
@@ -379,7 +379,7 @@ _gtk_bookmarks_manager_has_bookmark (GtkBookmarksManager *manager,
 gboolean
 _gtk_bookmarks_manager_insert_bookmark (GtkBookmarksManager *manager,
                                        GFile               *file,
-                                       gint                 position,
+                                       int                  position,
                                        GError             **error)
 {
   GSList *link;
@@ -463,7 +463,7 @@ _gtk_bookmarks_manager_remove_bookmark (GtkBookmarksManager *manager,
 gboolean
 _gtk_bookmarks_manager_reorder_bookmark (GtkBookmarksManager *manager,
                                         GFile               *file,
-                                        gint                 new_position,
+                                        int                  new_position,
                                         GError             **error)
 {
   GSList *link;
index b876511a98a68897bbd101f78e5bdc76b6ffa665..e61c713a46749c38b8f5b1f749b98f12acff73ab 100644 (file)
@@ -56,7 +56,7 @@ GSList *_gtk_bookmarks_manager_list_bookmarks (GtkBookmarksManager *manager);
 
 gboolean _gtk_bookmarks_manager_insert_bookmark (GtkBookmarksManager *manager,
                                                 GFile               *file,
-                                                gint                 position,
+                                                int                  position,
                                                 GError             **error);
 
 gboolean _gtk_bookmarks_manager_remove_bookmark (GtkBookmarksManager *manager,
@@ -65,7 +65,7 @@ gboolean _gtk_bookmarks_manager_remove_bookmark (GtkBookmarksManager *manager,
 
 gboolean _gtk_bookmarks_manager_reorder_bookmark (GtkBookmarksManager *manager,
                                                  GFile               *file,
-                                                 gint                 new_position,
+                                                 int                  new_position,
                                                  GError             **error);
 
 gboolean _gtk_bookmarks_manager_has_bookmark (GtkBookmarksManager *manager,
index d4c296e7df801fa460be840da0ab12fd3f4a7366..4e6a228cb3062b562250995833db9cd23019146a 100644 (file)
@@ -323,7 +323,7 @@ gtk_box_buildable_iface_init (GtkBuildableIface *iface)
  **/
 GtkWidget*
 gtk_box_new (GtkOrientation orientation,
-             gint           spacing)
+             int            spacing)
 {
   return g_object_new (GTK_TYPE_BOX,
                        "orientation", orientation,
@@ -390,7 +390,7 @@ gtk_box_get_homogeneous (GtkBox *box)
  */
 void
 gtk_box_set_spacing (GtkBox *box,
-                    gint    spacing)
+                    int     spacing)
 {
   GtkBoxLayout *box_layout;
 
@@ -412,7 +412,7 @@ gtk_box_set_spacing (GtkBox *box,
  *
  * Returns: spacing between children
  **/
-gint
+int
 gtk_box_get_spacing (GtkBox *box)
 {
   GtkLayoutManager *box_layout;
index 01f191c97e48f4726f7cf4b48b6ccce346fbf2e1..3d74fb73cee51d94ee9e6850f2f0ee7c4c3fada6 100644 (file)
@@ -70,7 +70,7 @@ GDK_AVAILABLE_IN_ALL
 GType       gtk_box_get_type            (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,
-                                         gint            spacing);
+                                         int             spacing);
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_homogeneous     (GtkBox         *box,
                                          gboolean        homogeneous);
@@ -78,9 +78,9 @@ GDK_AVAILABLE_IN_ALL
 gboolean    gtk_box_get_homogeneous     (GtkBox         *box);
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_spacing         (GtkBox         *box,
-                                         gint            spacing);
+                                         int             spacing);
 GDK_AVAILABLE_IN_ALL
-gint        gtk_box_get_spacing         (GtkBox         *box);
+int         gtk_box_get_spacing         (GtkBox         *box);
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_baseline_position (GtkBox             *box,
                                            GtkBaselinePosition position);
index 042d4084e11e44e2a6ebea8124edf52cafc91f09..cb9bf024a03c1da35ec76fd22e6239bc133eff43 100644 (file)
@@ -162,8 +162,8 @@ gtk_box_layout_get_property (GObject    *gobject,
 static void
 count_expand_children (GtkWidget *widget,
                        GtkOrientation orientation,
-                       gint *visible_children,
-                       gint *expand_children)
+                       int *visible_children,
+                       int *expand_children)
 {
   GtkWidget *child;
 
@@ -183,13 +183,13 @@ count_expand_children (GtkWidget *widget,
     }
 }
 
-static gint
+static int
 get_spacing (GtkBoxLayout *self,
              GtkCssNode   *node)
 {
   GtkCssStyle *style = gtk_css_node_get_style (node);
   GtkCssValue *border_spacing;
-  gint css_spacing;
+  int css_spacing;
 
   border_spacing = style->size->border_spacing;
   if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -457,22 +457,22 @@ gtk_box_layout_allocate (GtkLayoutManager *layout_manager,
 {
   GtkBoxLayout *self = GTK_BOX_LAYOUT (layout_manager);
   GtkWidget *child;
-  gint nvis_children;
-  gint nexpand_children;
+  int nvis_children;
+  int nexpand_children;
   GtkTextDirection direction;
   GtkAllocation child_allocation;
   GtkRequestedSize *sizes;
-  gint child_minimum_baseline, child_natural_baseline;
-  gint minimum_above, natural_above;
-  gint minimum_below, natural_below;
+  int child_minimum_baseline, child_natural_baseline;
+  int minimum_above, natural_above;
+  int minimum_below, natural_below;
   gboolean have_baseline;
-  gint extra_space;
-  gint children_minimum_size = 0;
-  gint size_given_to_child;
-  gint n_extra_widgets = 0; /* Number of widgets that receive 1 extra px */
-  gint x = 0, y = 0, i;
-  gint child_size;
-  gint spacing;
+  int extra_space;
+  int children_minimum_size = 0;
+  int size_given_to_child;
+  int n_extra_widgets = 0; /* Number of widgets that receive 1 extra px */
+  int x = 0, y = 0, i;
+  int child_size;
+  int spacing;
 
   count_expand_children (widget, self->orientation, &nvis_children, &nexpand_children);
 
index 1dc1b08171950c46a17219807cb23ed65c8dbc52..560fe9dcce387593d8c83a27eb3dadd5c91de933 100644 (file)
@@ -226,8 +226,8 @@ GDK_AVAILABLE_IN_ALL
 GPtrArray    *gtk_buildable_parse_context_get_element_stack (GtkBuildableParseContext *context);
 GDK_AVAILABLE_IN_ALL
 void          gtk_buildable_parse_context_get_position      (GtkBuildableParseContext *context,
-                                                             gint                     *line_number,
-                                                             gint                     *char_number);
+                                                             int                      *line_number,
+                                                             int                      *char_number);
 
 G_END_DECLS
 
index a1783629b53b32376ac5ce8d8a6680653f6a2415..14d54cc8320ee7e0647c7b1ae781a0604b87dc0b 100644 (file)
@@ -305,7 +305,7 @@ gtk_builder_menu_text (GtkBuildableParseContext  *context,
                        GError                   **error)
 {
   GtkBuilderMenuState *state = user_data;
-  gint i;
+  int i;
 
   for (i = 0; i < text_len; i++)
     if (!g_ascii_isspace (text[i]))
index b97f0bdb2776fb3dae42b130e7129b7de9364ac0..705bc52ec42aeca77c113edf0e78f9bd7f6b5322 100644 (file)
@@ -450,8 +450,8 @@ typedef struct
   gchar *object;
   GParamSpec *pspec;
   gchar *value;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } DelayedProperty;
 
 typedef struct
@@ -919,7 +919,7 @@ _gtk_builder_apply_properties (GtkBuilder  *builder,
   GtkBuildableIface *iface;
   GtkBuildable *buildable;
   gboolean custom_set_property;
-  gint i;
+  int i;
 
   g_assert (info->object != NULL);
   g_assert (info->type != G_TYPE_INVALID);
@@ -2108,7 +2108,7 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
       }
     case G_TYPE_ENUM:
       {
-        gint enum_value;
+        int enum_value;
         if (!_gtk_builder_enum_from_string (type, string, &enum_value, error))
           {
             ret = FALSE;
@@ -2408,13 +2408,13 @@ gtk_builder_value_from_string_type (GtkBuilder   *builder,
 gboolean
 _gtk_builder_enum_from_string (GType         type,
                                const gchar  *string,
-                               gint         *enum_value,
+                               int          *enum_value,
                                GError      **error)
 {
   GEnumClass *eclass;
   GEnumValue *ev;
   gchar *endptr;
-  gint value;
+  int value;
   gboolean ret;
 
   g_return_val_if_fail (G_TYPE_IS_ENUM (type), FALSE);
@@ -2847,7 +2847,7 @@ _gtk_builder_prefix_error (GtkBuilder                *builder,
                            GError                   **error)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
-  gint line, col;
+  int line, col;
 
   gtk_buildable_parse_context_get_position (context, &line, &col);
   g_prefix_error (error, "%s:%d:%d ", priv->filename, line, col);
@@ -2874,7 +2874,7 @@ _gtk_builder_error_unhandled_tag (GtkBuilder                *builder,
                                   GError                   **error)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
-  gint line, col;
+  int line, col;
 
   gtk_buildable_parse_context_get_position (context, &line, &col);
   g_set_error (error,
@@ -2907,7 +2907,7 @@ _gtk_builder_check_parent (GtkBuilder                *builder,
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
   GPtrArray *stack;
-  gint line, col;
+  int line, col;
   const gchar *parent;
   const gchar *element;
 
@@ -2933,8 +2933,8 @@ _gtk_builder_check_parent (GtkBuilder                *builder,
 GObject *
 gtk_builder_lookup_object (GtkBuilder   *builder,
                            const gchar  *name,
-                           gint          line,
-                           gint          col,
+                           int           line,
+                           int           col,
                            GError      **error)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
@@ -2970,8 +2970,8 @@ gtk_builder_lookup_object (GtkBuilder   *builder,
 GObject *
 _gtk_builder_lookup_object (GtkBuilder  *builder,
                             const gchar *name,
-                            gint         line,
-                            gint         col)
+                            int          line,
+                            int          col)
 {
   GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder);
   GObject *obj;
index 5014b161f4752459396dda29307da8ee0eba8a1e..345cfb0f301678a66de6d3a528b356de40f2c485 100644 (file)
@@ -343,8 +343,8 @@ gtk_buildable_parse_context_get_element_stack (GtkBuildableParseContext *context
  */
 void
 gtk_buildable_parse_context_get_position (GtkBuildableParseContext *context,
-                                          gint                *line_number,
-                                          gint                *char_number)
+                                          int                 *line_number,
+                                          int                 *char_number)
 
 {
   if (context->ctx)
@@ -397,7 +397,7 @@ error_missing_attribute (ParserData   *data,
                          const gchar  *attribute,
                          GError      **error)
 {
-  gint line, col;
+  int line, col;
 
   gtk_buildable_parse_context_get_position (&data->ctx, &line, &col);
 
@@ -414,7 +414,7 @@ error_invalid_tag (ParserData   *data,
                    const gchar  *expected,
                    GError      **error)
 {
-  gint line, col;
+  int line, col;
 
   gtk_buildable_parse_context_get_position (&data->ctx, &line, &col);
 
@@ -437,7 +437,7 @@ error_unhandled_tag (ParserData   *data,
                      const gchar  *tag,
                      GError      **error)
 {
-  gint line, col;
+  int line, col;
 
   gtk_buildable_parse_context_get_position (&data->ctx, &line, &col);
   g_set_error (error,
@@ -496,8 +496,8 @@ parse_requires (ParserData   *data,
   const gchar  *library = NULL;
   const gchar  *version = NULL;
   gchar **split;
-  gint version_major = 0;
-  gint version_minor = 0;
+  int version_major = 0;
+  int version_minor = 0;
 
   if (!g_markup_collect_attributes (element_name, names, values, error,
                                     G_MARKUP_COLLECT_STRING, "lib", &library,
@@ -560,7 +560,7 @@ parse_object (GtkBuildableParseContext  *context,
   const gchar *type_func = NULL;
   const gchar *object_id = NULL;
   gchar *internal_id = NULL;
-  gint line;
+  int line;
 
   child_info = state_peek_info (data, ChildInfo);
   if (child_info && child_info->tag_type == TAG_OBJECT)
@@ -688,7 +688,7 @@ parse_template (GtkBuildableParseContext  *context,
   ObjectInfo *object_info;
   const gchar *object_class = NULL;
   const gchar *parent_class = NULL;
-  gint line;
+  int line;
   GType template_type;
   GType parsed_type;
 
@@ -860,7 +860,7 @@ parse_property (ParserData   *data,
   gboolean translatable = FALSE;
   ObjectInfo *object_info;
   GParamSpec *pspec = NULL;
-  gint line, col;
+  int line, col;
 
   object_info = state_peek_info (data, ObjectInfo);
   if (!object_info ||
index 198806e6fc7a852457548c18eac4e6ffdff48fd7..647d4781149a703f3507e7313202686ffc82246e 100644 (file)
@@ -178,7 +178,7 @@ static const GMarkupParser record_parser =
   NULL, // error, fails immediately
 };
 
-static gint
+static int
 compare_string (gconstpointer _a,
                 gconstpointer _b)
 {
index 1bee1bda8157371a4e8df486d856a3b85da015be..a401f69a3311473f57d20ef313a9c955db07a92d 100644 (file)
@@ -72,8 +72,8 @@ typedef struct {
   gboolean translatable:1;
   gboolean bound:1;
   gchar *context;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } PropertyInfo;
 
 typedef struct _ExpressionInfo ExpressionInfo;
@@ -124,8 +124,8 @@ typedef struct
   gchar *source;
   gchar *source_property;
   GBindingFlags flags;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } BindingInfo;
 
 typedef struct
@@ -135,15 +135,15 @@ typedef struct
   GParamSpec *target_pspec;
   char *object_name;
   ExpressionInfo *expr;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } BindingExpressionInfo;
 
 typedef struct {
   guint    tag_type;
   gchar   *library;
-  gint     major;
-  gint     minor;
+  int      major;
+  int      minor;
 } RequiresInfo;
 
 struct _GtkBuildableParseContext {
@@ -182,10 +182,10 @@ typedef struct {
 
   const char **requested_objects; /* NULL if all the objects are requested */
   gboolean inside_requested_object;
-  gint requested_object_level;
-  gint cur_object_level;
+  int requested_object_level;
+  int cur_object_level;
 
-  gint object_counter;
+  int object_counter;
 
   GHashTable *object_ids;
 } ParserData;
@@ -238,7 +238,7 @@ gboolean _gtk_builder_boolean_from_string (const gchar  *string,
                                           GError      **error);
 gboolean _gtk_builder_enum_from_string (GType         type,
                                         const gchar  *string,
-                                        gint         *enum_value,
+                                        int          *enum_value,
                                         GError      **error);
 gboolean  _gtk_builder_flags_from_string (GType         type,
                                           GFlagsValue  *aliases,
@@ -276,13 +276,13 @@ gboolean _gtk_builder_check_parent        (GtkBuilder                *builder,
                                            GError                   **error);
 GObject *gtk_builder_lookup_object        (GtkBuilder                *builder,
                                            const gchar               *name,
-                                           gint                       line,
-                                           gint                       col,
+                                           int                        line,
+                                           int                        col,
                                            GError                   **error);
 GObject *_gtk_builder_lookup_object       (GtkBuilder                *builder,
                                            const gchar               *name,
-                                           gint                       line,
-                                           gint                       col);
+                                           int                        line,
+                                           int                        col);
 gboolean _gtk_builder_lookup_failed       (GtkBuilder                *builder,
                                            GError                   **error);
 GModule *gtk_builder_get_module           (GtkBuilder                *builder);
index de6003b7d590ffc7760a0355d272fe0d409f2512..4b121568a2e592a824ee3fd45c0684461c931712 100644 (file)
@@ -197,7 +197,7 @@ type_name_mangle (const gchar *name,
                   gboolean     split_first_cap)
 {
   GString *symbol_name = g_string_new ("");
-  gint i;
+  int i;
 
   for (i = 0; name[i] != '\0'; i++)
     {
index 40f022f991b02873815b8380b5d8b5fed95dfb11..0c727174d18142be2f427bdcce9e27fbbeb2e88f 100644 (file)
@@ -218,16 +218,16 @@ struct _GtkCalendar
 
   GDateTime *date;
 
-  gint  day_month[6][7];
-  gint  day[6][7];
+  int   day_month[6][7];
+  int   day[6][7];
 
-  gint  num_marked_dates;
-  gint  marked_date[31];
+  int   num_marked_dates;
+  int   marked_date[31];
 
-  gint  focus_row;
-  gint  focus_col;
+  int   focus_row;
+  int   focus_col;
 
-  gint week_start;
+  int week_start;
 };
 
 struct _GtkCalendarClass
@@ -264,10 +264,10 @@ static void     gtk_calendar_focus_controller_focus     (GtkEventController    *
                                                          GtkWidget             *widget);
 
 static void calendar_invalidate_day     (GtkCalendar *widget,
-                                         gint       row,
-                                         gint       col);
+                                         int        row,
+                                         int        col);
 static void calendar_invalidate_day_num (GtkCalendar *widget,
-                                         gint       day);
+                                         int        day);
 
 static gboolean gtk_calendar_scroll_controller_scroll (GtkEventControllerScroll *scroll,
                                                        gdouble                   dx,
@@ -551,7 +551,7 @@ gtk_calendar_init (GtkCalendar *calendar)
   GtkGesture *gesture;
   GtkDragSource *source;
   GtkDropTarget *target;
-  gint i;
+  int i;
 #ifdef G_OS_WIN32
   wchar_t wbuffer[100];
 #else
@@ -562,8 +562,8 @@ gtk_calendar_init (GtkCalendar *calendar)
   gchar *year_before;
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
   union { unsigned int word; char *string; } langinfo;
-  gint week_1stday = 0;
-  gint first_weekday = 1;
+  int week_1stday = 0;
+  int first_weekday = 1;
   guint week_origin;
 #else
   gchar *week_start;
@@ -961,8 +961,8 @@ calendar_select_and_focus_day (GtkCalendar *calendar,
                                int          day)
 {
   GDateTime *new_date;
-  gint row;
-  gint col;
+  int row;
+  int col;
 
   for (row = 0; row < 6; row ++)
     for (col = 0; col < 7; col++)
@@ -1080,15 +1080,15 @@ gtk_calendar_get_property (GObject      *object,
 
 static void
 calendar_invalidate_day_num (GtkCalendar *calendar,
-                             gint         day)
+                             int          day)
 {
   gtk_widget_queue_draw (GTK_WIDGET (calendar));
 }
 
 static void
 calendar_invalidate_day (GtkCalendar *calendar,
-                         gint         row,
-                         gint         col)
+                         int          row,
+                         int          col)
 {
   gtk_widget_queue_draw (GTK_WIDGET (calendar));
 }
@@ -1237,10 +1237,10 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
                                          GtkWidget             *widget)
 {
   GtkCalendar *calendar = GTK_CALENDAR (widget);
-  gint return_val;
-  gint old_focus_row;
-  gint old_focus_col;
-  gint row, col, day;
+  int return_val;
+  int old_focus_row;
+  int old_focus_col;
+  int row, col, day;
 
   return_val = FALSE;
 
index 1a161db23f39295dd1de6198eb2aada16b75bb61..8eb34534cf2ddab1990ee6378420bd6e94224a55 100644 (file)
@@ -75,8 +75,8 @@
  *
  * |[<!-- language="C" -->
  * GtkTreeIter iter;
- * gint        minimum_width;
- * gint        natural_width;
+ * int         minimum_width;
+ * int         natural_width;
  *
  * valid = gtk_tree_model_get_iter_first (model, &iter);
  * while (valid)
  * |[<!-- language="C" -->
  * static void
  * foo_get_preferred_width (GtkWidget       *widget,
- *                          gint            *minimum_size,
- *                          gint            *natural_size)
+ *                          int             *minimum_size,
+ *                          int             *natural_size)
  * {
  *   Foo        *foo  = FOO (widget);
  *   FooPrivate *priv = foo->priv;
  *
  * |[<!-- language="C" -->
  * GtkTreeIter iter;
- * gint        minimum_height;
- * gint        natural_height;
- * gint        full_minimum_height = 0;
- * gint        full_natural_height = 0;
+ * int         minimum_height;
+ * int         natural_height;
+ * int         full_minimum_height = 0;
+ * int         full_natural_height = 0;
  *
  * valid = gtk_tree_model_get_iter_first (model, &iter);
  * while (valid)
  * GtkAllocation allocation;
  * GdkRectangle  cell_area = { 0, };
  * GtkTreeIter   iter;
- * gint          minimum_width;
- * gint          natural_width;
+ * int           minimum_width;
+ * int           natural_width;
  *
  * gtk_widget_get_allocation (widget, &allocation);
  * cell_area.width = allocation.width;
  * {
  *   Foo        *foo  = FOO (widget);
  *   FooPrivate *priv = foo->priv;
- *   gint        focus_row;
+ *   int         focus_row;
  *   gboolean    have_focus = FALSE;
  *
  *   focus_row = priv->focus_row;
@@ -385,7 +385,7 @@ static void      gtk_cell_area_real_foreach_alloc                  (GtkCellArea
                                                                    const GdkRectangle  *background_area,
                                                                    GtkCellAllocCallback callback,
                                                                    gpointer             callback_data);
-static gint      gtk_cell_area_real_event                          (GtkCellArea          *area,
+static int       gtk_cell_area_real_event                          (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
                                                                     GdkEvent             *event,
@@ -412,25 +412,25 @@ static GtkSizeRequestMode  gtk_cell_area_real_get_request_mode     (GtkCellArea
 static void      gtk_cell_area_real_get_preferred_width            (GtkCellArea           *area,
                                                                    GtkCellAreaContext    *context,
                                                                    GtkWidget             *widget,
-                                                                   gint                  *minimum_width,
-                                                                   gint                  *natural_width);
+                                                                   int                   *minimum_width,
+                                                                   int                   *natural_width);
 static void      gtk_cell_area_real_get_preferred_height           (GtkCellArea           *area,
                                                                    GtkCellAreaContext    *context,
                                                                    GtkWidget             *widget,
-                                                                   gint                  *minimum_height,
-                                                                   gint                  *natural_height);
+                                                                   int                   *minimum_height,
+                                                                   int                   *natural_height);
 static void      gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea           *area,
                                                                     GtkCellAreaContext    *context,
                                                                     GtkWidget             *widget,
-                                                                    gint                   width,
-                                                                    gint                  *minimum_height,
-                                                                    gint                  *natural_height);
+                                                                    int                    width,
+                                                                    int                   *minimum_height,
+                                                                    int                   *natural_height);
 static void      gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea           *area,
                                                                     GtkCellAreaContext    *context,
                                                                     GtkWidget             *widget,
-                                                                    gint                   height,
-                                                                    gint                  *minimum_width,
-                                                                    gint                  *natural_width);
+                                                                    int                    height,
+                                                                    int                   *minimum_width,
+                                                                    int                   *natural_width);
 static gboolean  gtk_cell_area_real_is_activatable                 (GtkCellArea           *area);
 static gboolean  gtk_cell_area_real_activate                       (GtkCellArea           *area,
                                                                     GtkCellAreaContext    *context,
@@ -450,7 +450,7 @@ static void      gtk_cell_area_clear                         (GtkCellLayout
 static void      gtk_cell_area_add_attribute                 (GtkCellLayout         *cell_layout,
                                                               GtkCellRenderer       *renderer,
                                                               const gchar           *attribute,
-                                                              gint                   column);
+                                                              int                    column);
 static void      gtk_cell_area_set_cell_data_func            (GtkCellLayout         *cell_layout,
                                                               GtkCellRenderer       *cell,
                                                               GtkCellLayoutDataFunc  func,
@@ -460,7 +460,7 @@ static void      gtk_cell_area_clear_attributes              (GtkCellLayout
                                                               GtkCellRenderer       *renderer);
 static void      gtk_cell_area_reorder                       (GtkCellLayout         *cell_layout,
                                                               GtkCellRenderer       *cell,
-                                                              gint                   position);
+                                                              int                    position);
 static GList    *gtk_cell_area_get_cells                     (GtkCellLayout         *cell_layout);
 static GtkCellArea *gtk_cell_area_get_area                   (GtkCellLayout         *cell_layout);
 
@@ -498,8 +498,8 @@ typedef struct {
 
 /* Used in foreach loop to get a cell by position */
 typedef struct {
-  gint             x;
-  gint             y;
+  int              x;
+  int              y;
   GtkCellRenderer *renderer;
   GdkRectangle     cell_area;
 } CellByPositionData;
@@ -507,7 +507,7 @@ typedef struct {
 /* Attribute/Cell metadata */
 typedef struct {
   const gchar *attribute;
-  gint         column;
+  int          column;
 } CellAttribute;
 
 typedef struct {
@@ -525,9 +525,9 @@ static CellInfo       *cell_info_new       (GtkCellLayoutDataFunc  func,
 static void            cell_info_free      (CellInfo              *info);
 static CellAttribute  *cell_attribute_new  (GtkCellRenderer       *renderer,
                                             const gchar           *attribute,
-                                            gint                   column);
+                                            int                    column);
 static void            cell_attribute_free (CellAttribute         *attribute);
-static gint            cell_attribute_find (CellAttribute         *cell_attribute,
+static int             cell_attribute_find (CellAttribute         *cell_attribute,
                                             const gchar           *attribute);
 
 /* Internal functions/signal emissions */
@@ -850,7 +850,7 @@ cell_info_free (CellInfo *info)
 static CellAttribute  *
 cell_attribute_new  (GtkCellRenderer       *renderer,
                      const gchar           *attribute,
-                     gint                   column)
+                     int                    column)
 {
   GParamSpec *pspec;
 
@@ -880,7 +880,7 @@ cell_attribute_free (CellAttribute *attribute)
 }
 
 /* GCompareFunc for g_slist_find_custom() */
-static gint
+static int
 cell_attribute_find (CellAttribute *cell_attribute,
                      const gchar   *attribute)
 {
@@ -1011,7 +1011,7 @@ gtk_cell_area_real_foreach_alloc (GtkCellArea         *area,
                g_type_name (G_TYPE_FROM_INSTANCE (area)));
 }
 
-static gint
+static int
 gtk_cell_area_real_event (GtkCellArea          *area,
                           GtkCellAreaContext   *context,
                           GtkWidget            *widget,
@@ -1306,8 +1306,8 @@ static void
 gtk_cell_area_real_get_preferred_width (GtkCellArea        *area,
                                        GtkCellAreaContext *context,
                                        GtkWidget          *widget,
-                                       gint               *minimum_width,
-                                       gint               *natural_width)
+                                       int                *minimum_width,
+                                       int                *natural_width)
 {
   g_warning ("GtkCellAreaClass::get_preferred_width not implemented for '%s'",
             g_type_name (G_TYPE_FROM_INSTANCE (area)));
@@ -1317,8 +1317,8 @@ static void
 gtk_cell_area_real_get_preferred_height (GtkCellArea        *area,
                                         GtkCellAreaContext *context,
                                         GtkWidget          *widget,
-                                        gint               *minimum_height,
-                                        gint               *natural_height)
+                                        int                *minimum_height,
+                                        int                *natural_height)
 {
   g_warning ("GtkCellAreaClass::get_preferred_height not implemented for '%s'",
             g_type_name (G_TYPE_FROM_INSTANCE (area)));
@@ -1328,9 +1328,9 @@ static void
 gtk_cell_area_real_get_preferred_height_for_width (GtkCellArea        *area,
                                                    GtkCellAreaContext *context,
                                                    GtkWidget          *widget,
-                                                  gint                width,
-                                                   gint               *minimum_height,
-                                                   gint               *natural_height)
+                                                  int                 width,
+                                                   int                *minimum_height,
+                                                   int                *natural_height)
 {
   /* If the area doesnt do height-for-width, fallback on base preferred height */
   GTK_CELL_AREA_GET_CLASS (area)->get_preferred_height (area, context, widget, minimum_height, natural_height);
@@ -1340,9 +1340,9 @@ static void
 gtk_cell_area_real_get_preferred_width_for_height (GtkCellArea        *area,
                                                    GtkCellAreaContext *context,
                                                    GtkWidget          *widget,
-                                                   gint                height,
-                                                   gint               *minimum_width,
-                                                   gint               *natural_width)
+                                                   int                 height,
+                                                   int                *minimum_width,
+                                                   int                *natural_width)
 {
   /* If the area doesnt do width-for-height, fallback on base preferred width */
   GTK_CELL_AREA_GET_CLASS (area)->get_preferred_width (area, context, widget, minimum_width, natural_width);
@@ -1493,7 +1493,7 @@ static void
 gtk_cell_area_add_attribute (GtkCellLayout         *cell_layout,
                              GtkCellRenderer       *renderer,
                              const gchar           *attribute,
-                             gint                   column)
+                             int                    column)
 {
   gtk_cell_area_attribute_connect (GTK_CELL_AREA (cell_layout),
                                    renderer, attribute, column);
@@ -1531,7 +1531,7 @@ gtk_cell_area_clear_attributes (GtkCellLayout         *cell_layout,
 static void
 gtk_cell_area_reorder (GtkCellLayout   *cell_layout,
                        GtkCellRenderer *cell,
-                       gint             position)
+                       int              position)
 {
   g_warning ("GtkCellLayout::reorder not implemented for '%s'",
              g_type_name (G_TYPE_FROM_INSTANCE (cell_layout)));
@@ -1747,7 +1747,7 @@ gtk_cell_area_foreach_alloc (GtkCellArea          *area,
  *
  * Returns: %TRUE if the event was handled by @area.
  */
-gint
+int
 gtk_cell_area_event (GtkCellArea          *area,
                      GtkCellAreaContext   *context,
                      GtkWidget            *widget,
@@ -1901,8 +1901,8 @@ gtk_cell_area_get_cell_at_position (GtkCellArea          *area,
                                     GtkCellAreaContext   *context,
                                     GtkWidget            *widget,
                                     const GdkRectangle   *cell_area,
-                                    gint                  x,
-                                    gint                  y,
+                                    int                   x,
+                                    int                   y,
                                     GdkRectangle         *alloc_area)
 {
   CellByPositionData data = { x, y, NULL, { 0, } };
@@ -2014,8 +2014,8 @@ void
 gtk_cell_area_get_preferred_width (GtkCellArea        *area,
                                    GtkCellAreaContext *context,
                                    GtkWidget          *widget,
-                                   gint               *minimum_width,
-                                   gint               *natural_width)
+                                   int                *minimum_width,
+                                   int                *natural_width)
 {
   g_return_if_fail (GTK_IS_CELL_AREA (area));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -2052,9 +2052,9 @@ void
 gtk_cell_area_get_preferred_height_for_width (GtkCellArea        *area,
                                               GtkCellAreaContext *context,
                                               GtkWidget          *widget,
-                                              gint                width,
-                                              gint               *minimum_height,
-                                              gint               *natural_height)
+                                              int                 width,
+                                              int                *minimum_height,
+                                              int                *natural_height)
 {
   GtkCellAreaClass *class;
 
@@ -2086,8 +2086,8 @@ void
 gtk_cell_area_get_preferred_height (GtkCellArea        *area,
                                     GtkCellAreaContext *context,
                                     GtkWidget          *widget,
-                                    gint               *minimum_height,
-                                    gint               *natural_height)
+                                    int                *minimum_height,
+                                    int                *natural_height)
 {
   g_return_if_fail (GTK_IS_CELL_AREA (area));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -2124,9 +2124,9 @@ void
 gtk_cell_area_get_preferred_width_for_height (GtkCellArea        *area,
                                               GtkCellAreaContext *context,
                                               GtkWidget          *widget,
-                                              gint                height,
-                                              gint               *minimum_width,
-                                              gint               *natural_width)
+                                              int                 height,
+                                              int                *minimum_width,
+                                              int                *natural_width)
 {
   GtkCellAreaClass *class;
 
@@ -2155,7 +2155,7 @@ void
 gtk_cell_area_attribute_connect (GtkCellArea        *area,
                                  GtkCellRenderer    *renderer,
                                  const gchar        *attribute,
-                                 gint                column)
+                                 int                 column)
 {
   GtkCellAreaPrivate *priv = gtk_cell_area_get_instance_private (area);
   CellInfo           *info;
@@ -2260,7 +2260,7 @@ gtk_cell_area_attribute_disconnect (GtkCellArea        *area,
  *
  * Returns: the model column, or -1
  */
-gint
+int
 gtk_cell_area_attribute_get_column (GtkCellArea     *area,
                                     GtkCellRenderer *renderer,
                                     const gchar     *attribute)
@@ -3454,9 +3454,9 @@ gtk_cell_area_request_renderer (GtkCellArea        *area,
                                 GtkCellRenderer    *renderer,
                                 GtkOrientation      orientation,
                                 GtkWidget          *widget,
-                                gint                for_size,
-                                gint               *minimum_size,
-                                gint               *natural_size)
+                                int                 for_size,
+                                int                *minimum_size,
+                                int                *natural_size)
 {
   GtkBorder border;
   GtkStyleContext *context;
index 4a3d98e8dc64192b256fa51afa4dcdb32c33a320..eecb6b3e367d4ea54f587ab59774d96e768b6284 100644 (file)
@@ -189,7 +189,7 @@ struct _GtkCellAreaClass
                                                           const GdkRectangle      *background_area,
                                                           GtkCellAllocCallback     callback,
                                                           gpointer                 callback_data);
-  gint               (* event)                           (GtkCellArea             *area,
+  int                (* event)                           (GtkCellArea             *area,
                                                           GtkCellAreaContext      *context,
                                                           GtkWidget               *widget,
                                                           GdkEvent                *event,
@@ -217,25 +217,25 @@ struct _GtkCellAreaClass
   void               (* get_preferred_width)             (GtkCellArea             *area,
                                                           GtkCellAreaContext      *context,
                                                           GtkWidget               *widget,
-                                                          gint                    *minimum_width,
-                                                          gint                    *natural_width);
+                                                          int                     *minimum_width,
+                                                          int                     *natural_width);
   void               (* get_preferred_height_for_width)  (GtkCellArea             *area,
                                                           GtkCellAreaContext      *context,
                                                           GtkWidget               *widget,
-                                                          gint                     width,
-                                                          gint                    *minimum_height,
-                                                          gint                    *natural_height);
+                                                          int                      width,
+                                                          int                     *minimum_height,
+                                                          int                     *natural_height);
   void               (* get_preferred_height)            (GtkCellArea             *area,
                                                           GtkCellAreaContext      *context,
                                                           GtkWidget               *widget,
-                                                          gint                    *minimum_height,
-                                                          gint                    *natural_height);
+                                                          int                     *minimum_height,
+                                                          int                     *natural_height);
   void               (* get_preferred_width_for_height)  (GtkCellArea             *area,
                                                           GtkCellAreaContext      *context,
                                                           GtkWidget               *widget,
-                                                          gint                     height,
-                                                          gint                    *minimum_width,
-                                                          gint                    *natural_width);
+                                                          int                      height,
+                                                          int                     *minimum_width,
+                                                          int                     *natural_width);
 
   /* Cell Properties */
   void               (* set_cell_property)               (GtkCellArea             *area,
@@ -291,7 +291,7 @@ void                  gtk_cell_area_foreach_alloc                  (GtkCellArea
                                                                     GtkCellAllocCallback  callback,
                                                                     gpointer              callback_data);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_cell_area_event                          (GtkCellArea          *area,
+int                   gtk_cell_area_event                          (GtkCellArea          *area,
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
                                                                     GdkEvent             *event,
@@ -319,8 +319,8 @@ GtkCellRenderer      *gtk_cell_area_get_cell_at_position           (GtkCellArea
                                                                     GtkCellAreaContext   *context,
                                                                     GtkWidget            *widget,
                                                                     const GdkRectangle   *cell_area,
-                                                                    gint                  x,
-                                                                    gint                  y,
+                                                                    int                   x,
+                                                                    int                   y,
                                                                     GdkRectangle         *alloc_area);
 
 /* Geometry */
@@ -335,28 +335,28 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_width            (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
-                                                                    gint               *minimum_width,
-                                                                    gint               *natural_width);
+                                                                    int                *minimum_width,
+                                                                    int                *natural_width);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_height_for_width (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
-                                                                    gint                width,
-                                                                    gint               *minimum_height,
-                                                                    gint               *natural_height);
+                                                                    int                 width,
+                                                                    int                *minimum_height,
+                                                                    int                *natural_height);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_height           (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
-                                                                    gint               *minimum_height,
-                                                                    gint               *natural_height);
+                                                                    int                *minimum_height,
+                                                                    int                *natural_height);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_get_preferred_width_for_height (GtkCellArea        *area,
                                                                     GtkCellAreaContext *context,
                                                                     GtkWidget          *widget,
-                                                                    gint                height,
-                                                                    gint               *minimum_width,
-                                                                    gint               *natural_width);
+                                                                    int                 height,
+                                                                    int                *minimum_width,
+                                                                    int                *natural_width);
 GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_cell_area_get_current_path_string        (GtkCellArea        *area);
 
@@ -372,13 +372,13 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_attribute_connect              (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *attribute,
-                                                                    gint                column);
+                                                                    int                 column);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_cell_area_attribute_disconnect           (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *attribute);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_cell_area_attribute_get_column           (GtkCellArea        *area,
+int                   gtk_cell_area_attribute_get_column           (GtkCellArea        *area,
                                                                     GtkCellRenderer    *renderer,
                                                                     const gchar        *attribute);
 
@@ -501,9 +501,9 @@ void                  gtk_cell_area_request_renderer               (GtkCellArea
                                                                     GtkCellRenderer    *renderer,
                                                                     GtkOrientation      orientation,
                                                                     GtkWidget          *widget,
-                                                                    gint                for_size,
-                                                                    gint               *minimum_size,
-                                                                    gint               *natural_size);
+                                                                    int                 for_size,
+                                                                    int                *minimum_size,
+                                                                    int                *natural_size);
 
 /* For api stability, this is called from gtkcelllayout.c in order to ensure the correct
  * object is passed to the user function in gtk_cell_layout_set_cell_data_func.
index 78dae26ba129ed5206ee79791fa86b1d17403d7f..5d82fd95ea8d3107c30152e33aa9fd903acef97c 100644 (file)
@@ -104,25 +104,25 @@ static GtkSizeRequestMode  gtk_cell_area_box_get_request_mode     (GtkCellArea
 static void      gtk_cell_area_box_get_preferred_width            (GtkCellArea          *area,
                                                                    GtkCellAreaContext   *context,
                                                                    GtkWidget            *widget,
-                                                                   gint                 *minimum_width,
-                                                                   gint                 *natural_width);
+                                                                   int                  *minimum_width,
+                                                                   int                  *natural_width);
 static void      gtk_cell_area_box_get_preferred_height           (GtkCellArea          *area,
                                                                    GtkCellAreaContext   *context,
                                                                    GtkWidget            *widget,
-                                                                   gint                 *minimum_height,
-                                                                   gint                 *natural_height);
+                                                                   int                  *minimum_height,
+                                                                   int                  *natural_height);
 static void      gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea          *area,
                                                                    GtkCellAreaContext   *context,
                                                                    GtkWidget            *widget,
-                                                                   gint                  width,
-                                                                   gint                 *minimum_height,
-                                                                   gint                 *natural_height);
+                                                                   int                   width,
+                                                                   int                  *minimum_height,
+                                                                   int                  *natural_height);
 static void      gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea          *area,
                                                                    GtkCellAreaContext   *context,
                                                                    GtkWidget            *widget,
-                                                                   gint                  height,
-                                                                   gint                 *minimum_width,
-                                                                   gint                 *natural_width);
+                                                                   int                   height,
+                                                                   int                  *minimum_width,
+                                                                   int                  *natural_width);
 static gboolean  gtk_cell_area_box_focus                          (GtkCellArea          *area,
                                                                    GtkDirectionType      direction);
 
@@ -136,7 +136,7 @@ static void      gtk_cell_area_box_layout_pack_end                (GtkCellLayout
                                                                    gboolean            expand);
 static void      gtk_cell_area_box_layout_reorder                 (GtkCellLayout      *cell_layout,
                                                                    GtkCellRenderer    *renderer,
-                                                                   gint                position);
+                                                                   int                 position);
 static void      gtk_cell_area_box_focus_changed                  (GtkCellArea        *area,
                                                                    GParamSpec         *pspec,
                                                                    GtkCellAreaBox     *box);
@@ -165,8 +165,8 @@ typedef struct {
 typedef struct {
   GtkCellRenderer *renderer;
 
-  gint             position;
-  gint             size;
+  int              position;
+  int              size;
 } AllocatedCell;
 
 static CellInfo      *cell_info_new          (GtkCellRenderer       *renderer,
@@ -175,15 +175,15 @@ static CellInfo      *cell_info_new          (GtkCellRenderer       *renderer,
                                               gboolean               align,
                                              gboolean               fixed);
 static void           cell_info_free         (CellInfo              *info);
-static gint           cell_info_find         (CellInfo              *info,
+static int            cell_info_find         (CellInfo              *info,
                                               GtkCellRenderer       *renderer);
 
 static AllocatedCell *allocated_cell_new     (GtkCellRenderer       *renderer,
-                                              gint                   position,
-                                              gint                   size);
+                                              int                    position,
+                                              int                    size);
 static void           allocated_cell_free    (AllocatedCell         *cell);
 static GList         *list_consecutive_cells (GtkCellAreaBox        *box);
-static gint           count_expand_groups    (GtkCellAreaBox        *box);
+static int            count_expand_groups    (GtkCellAreaBox        *box);
 static void           context_weak_notify    (GtkCellAreaBox        *box,
                                               GtkCellAreaBoxContext *dead_context);
 static void           reset_contexts         (GtkCellAreaBox        *box);
@@ -193,8 +193,8 @@ static void           init_context_group     (GtkCellAreaBox        *box,
 static GSList        *get_allocated_cells    (GtkCellAreaBox        *box,
                                               GtkCellAreaBoxContext *context,
                                               GtkWidget             *widget,
-                                              gint                   width,
-                                              gint                   height);
+                                              int                    width,
+                                              int                    height);
 
 typedef struct _GtkCellAreaBoxClass   GtkCellAreaBoxClass;
 typedef struct _GtkCellAreaBoxPrivate GtkCellAreaBoxPrivate;
@@ -224,7 +224,7 @@ struct _GtkCellAreaBoxPrivate
   GSList          *contexts;
 
   GtkOrientation   orientation;
-  gint             spacing;
+  int              spacing;
 
   /* We hold on to the rtl state from a widget we are requested for
    * so that we can navigate focus correctly
@@ -413,7 +413,7 @@ cell_info_free (CellInfo *info)
   g_slice_free (CellInfo, info);
 }
 
-static gint
+static int
 cell_info_find (CellInfo        *info,
                 GtkCellRenderer *renderer)
 {
@@ -422,8 +422,8 @@ cell_info_find (CellInfo        *info,
 
 static AllocatedCell *
 allocated_cell_new (GtkCellRenderer *renderer,
-                    gint             position,
-                    gint             size)
+                    int              position,
+                    int              size)
 {
   AllocatedCell *cell = g_slice_new (AllocatedCell);
 
@@ -476,7 +476,7 @@ static void
 cell_groups_clear (GtkCellAreaBox *box)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
-  gint                   i;
+  int                    i;
 
   for (i = 0; i < priv->groups->len; i++)
     {
@@ -553,13 +553,13 @@ cell_groups_rebuild (GtkCellAreaBox *box)
   init_context_groups (box);
 }
 
-static gint
+static int
 count_visible_cells (CellGroup *group,
-                     gint      *expand_cells)
+                     int       *expand_cells)
 {
   GList *l;
-  gint   visible_cells = 0;
-  gint   n_expand_cells = 0;
+  int    visible_cells = 0;
+  int    n_expand_cells = 0;
 
   for (l = group->cells; l; l = l->next)
     {
@@ -580,12 +580,12 @@ count_visible_cells (CellGroup *group,
   return visible_cells;
 }
 
-static gint
+static int
 count_expand_groups (GtkCellAreaBox  *box)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
-  gint                   i;
-  gint                   expand_groups = 0;
+  int                    i;
+  int                    expand_groups = 0;
 
   for (i = 0; i < priv->groups->len; i++)
     {
@@ -612,7 +612,7 @@ init_context_group (GtkCellAreaBox        *box,
                     GtkCellAreaBoxContext *context)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
-  gint                  *expand_groups, *align_groups, i;
+  int                   *expand_groups, *align_groups, i;
 
   expand_groups = g_new (gboolean, priv->groups->len);
   align_groups  = g_new (gboolean, priv->groups->len);
@@ -673,17 +673,17 @@ reset_contexts (GtkCellAreaBox *box)
 static GSList *
 allocate_cells_manually (GtkCellAreaBox        *box,
                          GtkWidget             *widget,
-                         gint                   width,
-                         gint                   height)
+                         int                    width,
+                         int                    height)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   GList                    *cells, *l;
   GSList                   *allocated_cells = NULL;
   GtkRequestedSize         *sizes;
-  gint                      i;
-  gint                      nvisible = 0, nexpand = 0, group_expand;
-  gint                      avail_size, extra_size, extra_extra, full_size;
-  gint                      position = 0, for_size;
+  int                       i;
+  int                       nvisible = 0, nexpand = 0, group_expand;
+  int                       avail_size, extra_size, extra_extra, full_size;
+  int                       position = 0, for_size;
   gboolean                  rtl;
 
   if (!priv->cells)
@@ -807,16 +807,16 @@ static GSList *
 get_allocated_cells (GtkCellAreaBox        *box,
                      GtkCellAreaBoxContext *context,
                      GtkWidget             *widget,
-                     gint                   width,
-                     gint                   height)
+                     int                    width,
+                     int                    height)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   GtkCellAreaBoxAllocation *group_allocs;
   GtkCellArea              *area = GTK_CELL_AREA (box);
   GList                    *cell_list;
   GSList                   *allocated_cells = NULL;
-  gint                      i, j, n_allocs, position;
-  gint                      for_size, full_size;
+  int                       i, j, n_allocs, position;
+  int                       for_size, full_size;
   gboolean                  rtl;
 
   group_allocs = _gtk_cell_area_box_context_get_orientation_allocs (context, &n_allocs);
@@ -853,7 +853,7 @@ get_allocated_cells (GtkCellAreaBox        *box,
         {
           CellInfo      *info = group->cells->data;
           AllocatedCell *cell;
-         gint           cell_position, cell_size;
+         int            cell_position, cell_size;
 
          if (!gtk_cell_renderer_get_visible (info->renderer))
            continue;
@@ -869,7 +869,7 @@ get_allocated_cells (GtkCellAreaBox        *box,
            cell_size = group_allocs[i].size;
          else
            {
-             gint dummy;
+             int dummy;
               gtk_cell_area_request_renderer (area, info->renderer,
                                               priv->orientation,
                                               widget, for_size,
@@ -892,9 +892,9 @@ get_allocated_cells (GtkCellAreaBox        *box,
       else
         {
           GtkRequestedSize *sizes;
-          gint              avail_size, cell_position;
-          gint              visible_cells, expand_cells;
-          gint              extra_size, extra_extra;
+          int               avail_size, cell_position;
+          int               visible_cells, expand_cells;
+          int               extra_size, extra_extra;
 
           visible_cells = count_visible_cells (group, &expand_cells);
 
@@ -1307,7 +1307,7 @@ gtk_cell_area_box_apply_attributes (GtkCellArea  *area,
 {
   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (area);
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
-  gint                   i;
+  int                    i;
 
   /* Call the parent class to apply the attributes */
   GTK_CELL_AREA_CLASS
@@ -1500,27 +1500,27 @@ compute_size (GtkCellAreaBox        *box,
               GtkOrientation         orientation,
               GtkCellAreaBoxContext *context,
               GtkWidget             *widget,
-              gint                   for_size,
-              gint                  *minimum_size,
-              gint                  *natural_size)
+              int                    for_size,
+              int                   *minimum_size,
+              int                   *natural_size)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   GtkCellArea           *area = GTK_CELL_AREA (box);
   GList                 *list;
-  gint                   i;
-  gint                   min_size = 0;
-  gint                   nat_size = 0;
+  int                    i;
+  int                    min_size = 0;
+  int                    nat_size = 0;
 
   for (i = 0; i < priv->groups->len; i++)
     {
       CellGroup *group = &g_array_index (priv->groups, CellGroup, i);
-      gint       group_min_size = 0;
-      gint       group_nat_size = 0;
+      int        group_min_size = 0;
+      int        group_nat_size = 0;
 
       for (list = group->cells; list; list = list->next)
         {
           CellInfo *info = list->data;
-          gint      renderer_min_size, renderer_nat_size;
+          int       renderer_min_size, renderer_nat_size;
 
           if (!gtk_cell_renderer_get_visible (info->renderer))
               continue;
@@ -1587,11 +1587,11 @@ get_group_sizes (GtkCellArea    *area,
                  CellGroup      *group,
                  GtkOrientation  orientation,
                  GtkWidget      *widget,
-                 gint           *n_sizes)
+                 int            *n_sizes)
 {
   GtkRequestedSize *sizes;
   GList            *l;
-  gint              i;
+  int               i;
 
   *n_sizes = count_visible_cells (group, NULL);
   sizes    = g_new (GtkRequestedSize, *n_sizes);
@@ -1620,9 +1620,9 @@ static void
 compute_group_size_for_opposing_orientation (GtkCellAreaBox     *box,
                                              CellGroup          *group,
                                              GtkWidget          *widget,
-                                             gint                for_size,
-                                             gint               *minimum_size,
-                                             gint               *natural_size)
+                                             int                 for_size,
+                                             int                *minimum_size,
+                                             int                *natural_size)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   GtkCellArea           *area = GTK_CELL_AREA (box);
@@ -1640,10 +1640,10 @@ compute_group_size_for_opposing_orientation (GtkCellAreaBox     *box,
     {
       GtkRequestedSize *orientation_sizes;
       CellInfo         *info;
-      gint              n_sizes, i;
-      gint              avail_size     = for_size;
-      gint              extra_size, extra_extra;
-      gint              min_size = 0, nat_size = 0;
+      int               n_sizes, i;
+      int               avail_size     = for_size;
+      int               extra_size, extra_extra;
+      int               min_size = 0, nat_size = 0;
 
       orientation_sizes = get_group_sizes (area, group, priv->orientation, widget, &n_sizes);
 
@@ -1668,7 +1668,7 @@ compute_group_size_for_opposing_orientation (GtkCellAreaBox     *box,
 
       for (i = 0; i < n_sizes; i++)
         {
-          gint cell_min, cell_nat;
+          int cell_min, cell_nat;
 
           info = orientation_sizes[i].data;
 
@@ -1703,17 +1703,17 @@ static void
 compute_size_for_opposing_orientation (GtkCellAreaBox        *box,
                                        GtkCellAreaBoxContext *context,
                                        GtkWidget             *widget,
-                                       gint                   for_size,
-                                       gint                  *minimum_size,
-                                       gint                  *natural_size)
+                                       int                    for_size,
+                                       int                   *minimum_size,
+                                       int                   *natural_size)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   CellGroup             *group;
   GtkRequestedSize      *orientation_sizes;
-  gint                   n_groups, n_expand_groups, i;
-  gint                   avail_size = for_size;
-  gint                   extra_size, extra_extra;
-  gint                   min_size = 0, nat_size = 0;
+  int                    n_groups, n_expand_groups, i;
+  int                    avail_size = for_size;
+  int                    extra_size, extra_extra;
+  int                    min_size = 0, nat_size = 0;
 
   n_expand_groups = count_expand_groups (box);
 
@@ -1747,8 +1747,8 @@ compute_size_for_opposing_orientation (GtkCellAreaBox        *box,
    */
   for (i = 0; i < n_groups; i++)
     {
-      gint group_min, group_nat;
-      gint group_idx = GPOINTER_TO_INT (orientation_sizes[i].data);
+      int group_min, group_nat;
+      int group_idx = GPOINTER_TO_INT (orientation_sizes[i].data);
 
       group = &g_array_index (priv->groups, CellGroup, group_idx);
 
@@ -1800,12 +1800,12 @@ static void
 gtk_cell_area_box_get_preferred_width (GtkCellArea        *area,
                                        GtkCellAreaContext *context,
                                        GtkWidget          *widget,
-                                       gint               *minimum_width,
-                                       gint               *natural_width)
+                                       int                *minimum_width,
+                                       int                *natural_width)
 {
   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
   GtkCellAreaBoxContext *box_context;
-  gint                   min_width, nat_width;
+  int                    min_width, nat_width;
 
   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
 
@@ -1828,12 +1828,12 @@ static void
 gtk_cell_area_box_get_preferred_height (GtkCellArea        *area,
                                         GtkCellAreaContext *context,
                                         GtkWidget          *widget,
-                                        gint               *minimum_height,
-                                        gint               *natural_height)
+                                        int                *minimum_height,
+                                        int                *natural_height)
 {
   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
   GtkCellAreaBoxContext *box_context;
-  gint                   min_height, nat_height;
+  int                    min_height, nat_height;
 
   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
 
@@ -1856,14 +1856,14 @@ static void
 gtk_cell_area_box_get_preferred_height_for_width (GtkCellArea        *area,
                                                   GtkCellAreaContext *context,
                                                   GtkWidget          *widget,
-                                                  gint                width,
-                                                  gint               *minimum_height,
-                                                  gint               *natural_height)
+                                                  int                 width,
+                                                  int                *minimum_height,
+                                                  int                *natural_height)
 {
   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   GtkCellAreaBoxContext *box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
-  gint                   min_height, nat_height;
+  int                    min_height, nat_height;
 
   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
 
@@ -1894,14 +1894,14 @@ static void
 gtk_cell_area_box_get_preferred_width_for_height (GtkCellArea        *area,
                                                   GtkCellAreaContext *context,
                                                   GtkWidget          *widget,
-                                                  gint                height,
-                                                  gint               *minimum_width,
-                                                  gint               *natural_width)
+                                                  int                 height,
+                                                  int                *minimum_width,
+                                                  int                *natural_width)
 {
   GtkCellAreaBox        *box = GTK_CELL_AREA_BOX (area);
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   GtkCellAreaBoxContext *box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
-  gint                   min_width, nat_width;
+  int                    min_width, nat_width;
 
   g_return_if_fail (GTK_IS_CELL_AREA_BOX_CONTEXT (context));
 
@@ -1941,7 +1941,7 @@ gtk_cell_area_box_focus (GtkCellArea      *area,
 {
   GtkCellAreaBox        *box   = GTK_CELL_AREA_BOX (area);
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
-  gint                   cycle = FOCUS_NONE;
+  int                    cycle = FOCUS_NONE;
   gboolean               cycled_focus = FALSE;
   GtkCellRenderer       *focus_cell;
 
@@ -2002,7 +2002,7 @@ gtk_cell_area_box_focus (GtkCellArea      *area,
     {
       gboolean  found_cell = FALSE;
       GList    *list;
-      gint      i;
+      int       i;
 
       /* If there is no focused cell, focus on the first (or last) one */
       if (!focus_cell)
@@ -2068,7 +2068,7 @@ gtk_cell_area_box_layout_pack_end (GtkCellLayout      *cell_layout,
 static void
 gtk_cell_area_box_layout_reorder (GtkCellLayout      *cell_layout,
                                   GtkCellRenderer    *renderer,
-                                  gint                position)
+                                  int                 position)
 {
   GtkCellAreaBox        *box  = GTK_CELL_AREA_BOX (cell_layout);
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
@@ -2094,7 +2094,7 @@ gtk_cell_area_box_layout_reorder (GtkCellLayout      *cell_layout,
  *************************************************************/
 gboolean
 _gtk_cell_area_box_group_visible (GtkCellAreaBox  *box,
-                                 gint             group_idx)
+                                 int              group_idx)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
   CellGroup *group;
@@ -2213,7 +2213,7 @@ gtk_cell_area_box_pack_end (GtkCellAreaBox  *box,
  *
  * Returns: the space added between cell renderers in @box.
  */
-gint
+int
 gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
@@ -2232,7 +2232,7 @@ gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box)
  */
 void
 gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
-                               gint             spacing)
+                               int              spacing)
 {
   GtkCellAreaBoxPrivate *priv = gtk_cell_area_box_get_instance_private (box);
 
index e70dd5539c6d43ca728be299e3a06103d76c89ee..2c1ab869f64703b4c22ef2ada7c18c228253e343 100644 (file)
@@ -54,14 +54,14 @@ void         gtk_cell_area_box_pack_end    (GtkCellAreaBox  *box,
                                             gboolean         align,
                                             gboolean         fixed);
 GDK_AVAILABLE_IN_ALL
-gint         gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box);
+int          gtk_cell_area_box_get_spacing (GtkCellAreaBox  *box);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_box_set_spacing (GtkCellAreaBox  *box,
-                                            gint             spacing);
+                                            int              spacing);
 
 /* Private interaction with GtkCellAreaBoxContext */
 gboolean    _gtk_cell_area_box_group_visible (GtkCellAreaBox  *box,
-                                              gint             group_idx);
+                                              int              group_idx);
 
 G_END_DECLS
 
index 00aad38f1ba8180b1519ac63bb726c49268db8cf..9ad1ba6e7c9f9acef1f0c1323dc9c26a2eda54ff 100644 (file)
@@ -31,36 +31,36 @@ static void      _gtk_cell_area_box_context_finalize              (GObject
 /* GtkCellAreaContextClass */
 static void      _gtk_cell_area_box_context_reset                 (GtkCellAreaContext    *context);
 static void      _gtk_cell_area_box_context_get_preferred_height_for_width (GtkCellAreaContext *context,
-                                                                           gint                width,
-                                                                           gint               *minimum_height,
-                                                                           gint               *natural_height);
+                                                                           int                 width,
+                                                                           int                *minimum_height,
+                                                                           int                *natural_height);
 static void      _gtk_cell_area_box_context_get_preferred_width_for_height (GtkCellAreaContext *context,
-                                                                           gint                height,
-                                                                           gint               *minimum_width,
-                                                                           gint               *natural_width);
+                                                                           int                 height,
+                                                                           int                *minimum_width,
+                                                                           int                *natural_width);
 
 
 
 /* Internal functions */
 static void      _gtk_cell_area_box_context_sum                  (GtkCellAreaBoxContext  *context,
                                                                  GtkOrientation          orientation,
-                                                                 gint                    for_size,
-                                                                 gint                   *minimum_size,
-                                                                 gint                   *natural_size);
+                                                                 int                     for_size,
+                                                                 int                    *minimum_size,
+                                                                 int                    *natural_size);
 static void      free_cache_array                                (GArray                *array);
 static GArray   *group_array_new                                 (GtkCellAreaBoxContext *context);
 static GArray   *get_array                                       (GtkCellAreaBoxContext *context,
                                                                   GtkOrientation         orientation,
-                                                                  gint                   for_size);
+                                                                  int                    for_size);
 static gboolean  group_expands                                   (GtkCellAreaBoxContext *context,
-                                                                  gint                   group_idx);
-static gint      count_expand_groups                             (GtkCellAreaBoxContext *context);
+                                                                  int                    group_idx);
+static int       count_expand_groups                             (GtkCellAreaBoxContext *context);
 
 
 /* CachedSize management */
 typedef struct {
-  gint     min_size;
-  gint     nat_size;
+  int      min_size;
+  int      nat_size;
 } CachedSize;
 
 struct _GtkCellAreaBoxContextPrivate
@@ -103,7 +103,7 @@ group_array_new (GtkCellAreaBoxContext *context)
 static GArray *
 get_array (GtkCellAreaBoxContext *context,
            GtkOrientation         orientation,
-           gint                   for_size)
+           int                    for_size)
 {
   GtkCellAreaBoxContextPrivate *priv = context->priv;
   GArray                       *array;
@@ -138,7 +138,7 @@ get_array (GtkCellAreaBoxContext *context,
 
 static gboolean 
 group_expands (GtkCellAreaBoxContext *context,
-               gint                   group_idx)
+               int                    group_idx)
 {
   GtkCellAreaBoxContextPrivate *priv = context->priv;
 
@@ -147,11 +147,11 @@ group_expands (GtkCellAreaBoxContext *context,
   return priv->expand[group_idx];
 }
 
-static gint
+static int
 count_expand_groups (GtkCellAreaBoxContext *context)
 {
   GtkCellAreaBoxContextPrivate *priv = context->priv;
-  gint i, expand = 0;
+  int i, expand = 0;
 
   for (i = 0; i < priv->base_widths->len; i++)
     {
@@ -222,7 +222,7 @@ _gtk_cell_area_box_context_reset (GtkCellAreaContext *context)
   GtkCellAreaBoxContext        *box_context = GTK_CELL_AREA_BOX_CONTEXT (context);
   GtkCellAreaBoxContextPrivate *priv        = box_context->priv;
   CachedSize                   *size;
-  gint                          i;
+  int                           i;
 
   for (i = 0; i < priv->base_widths->len; i++)
     {
@@ -248,16 +248,16 @@ _gtk_cell_area_box_context_reset (GtkCellAreaContext *context)
 static void
 _gtk_cell_area_box_context_sum (GtkCellAreaBoxContext *context,
                                GtkOrientation         orientation,
-                               gint                   for_size,
-                               gint                  *minimum_size,
-                               gint                  *natural_size)
+                               int                    for_size,
+                               int                   *minimum_size,
+                               int                   *natural_size)
 {
   GtkCellAreaBoxContextPrivate *priv = context->priv;
   GtkCellAreaBox *area;
   GtkOrientation  box_orientation;
   GArray         *array;
-  gint            spacing, i, last_aligned_group_idx;
-  gint            min_size = 0, nat_size = 0;
+  int             spacing, i, last_aligned_group_idx;
+  int             min_size = 0, nat_size = 0;
 
   area            = (GtkCellAreaBox *)gtk_cell_area_context_get_area (GTK_CELL_AREA_CONTEXT (context));
   spacing         = gtk_cell_area_box_get_spacing (area);
@@ -319,9 +319,9 @@ _gtk_cell_area_box_context_sum (GtkCellAreaBoxContext *context,
 
 static void
 _gtk_cell_area_box_context_get_preferred_height_for_width (GtkCellAreaContext *context,
-                                                          gint                width,
-                                                          gint               *minimum_height,
-                                                          gint               *natural_height)
+                                                          int                 width,
+                                                          int                *minimum_height,
+                                                          int                *natural_height)
 {
   _gtk_cell_area_box_context_sum (GTK_CELL_AREA_BOX_CONTEXT (context), GTK_ORIENTATION_VERTICAL, 
                                  width, minimum_height, natural_height);
@@ -329,9 +329,9 @@ _gtk_cell_area_box_context_get_preferred_height_for_width (GtkCellAreaContext *c
 
 static void
 _gtk_cell_area_box_context_get_preferred_width_for_height (GtkCellAreaContext *context,
-                                                          gint                height,
-                                                          gint               *minimum_width,
-                                                          gint               *natural_width)
+                                                          int                 height,
+                                                          int                *minimum_width,
+                                                          int                *natural_width)
 {
   _gtk_cell_area_box_context_sum (GTK_CELL_AREA_BOX_CONTEXT (context), GTK_ORIENTATION_HORIZONTAL, 
                                  height, minimum_width, natural_width);
@@ -344,7 +344,7 @@ static void
 copy_size_array (GArray *src_array,
                  GArray *dest_array)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < src_array->len; i++)
     {
@@ -429,9 +429,9 @@ _gtk_cell_area_box_init_groups (GtkCellAreaBoxContext *box_context,
 
 void
 _gtk_cell_area_box_context_push_group_width (GtkCellAreaBoxContext *box_context,
-                                            gint                   group_idx,
-                                            gint                   minimum_width,
-                                            gint                   natural_width)
+                                            int                    group_idx,
+                                            int                    minimum_width,
+                                            int                    natural_width)
 {
   GtkCellAreaBoxContextPrivate *priv;
   CachedSize                   *size;
@@ -460,10 +460,10 @@ _gtk_cell_area_box_context_push_group_width (GtkCellAreaBoxContext *box_context,
 
 void
 _gtk_cell_area_box_context_push_group_height_for_width  (GtkCellAreaBoxContext *box_context,
-                                                        gint                   group_idx,
-                                                        gint                   for_width,
-                                                        gint                   minimum_height,
-                                                        gint                   natural_height)
+                                                        int                    group_idx,
+                                                        int                    for_width,
+                                                        int                    minimum_height,
+                                                        int                    natural_height)
 {
   GtkCellAreaBoxContextPrivate *priv;
   GArray                       *group_array;
@@ -488,9 +488,9 @@ _gtk_cell_area_box_context_push_group_height_for_width  (GtkCellAreaBoxContext *
 
 void
 _gtk_cell_area_box_context_push_group_height (GtkCellAreaBoxContext *box_context,
-                                             gint                   group_idx,
-                                             gint                   minimum_height,
-                                             gint                   natural_height)
+                                             int                    group_idx,
+                                             int                    minimum_height,
+                                             int                    natural_height)
 {
   GtkCellAreaBoxContextPrivate *priv;
   CachedSize                   *size;
@@ -519,10 +519,10 @@ _gtk_cell_area_box_context_push_group_height (GtkCellAreaBoxContext *box_context
 
 void
 _gtk_cell_area_box_context_push_group_width_for_height (GtkCellAreaBoxContext *box_context,
-                                                       gint                   group_idx,
-                                                       gint                   for_height,
-                                                       gint                   minimum_width,
-                                                       gint                   natural_width)
+                                                       int                    group_idx,
+                                                       int                    for_height,
+                                                       int                    minimum_width,
+                                                       int                    natural_width)
 {
   GtkCellAreaBoxContextPrivate *priv;
   GArray                       *group_array;
@@ -547,9 +547,9 @@ _gtk_cell_area_box_context_push_group_width_for_height (GtkCellAreaBoxContext *b
 
 void
 _gtk_cell_area_box_context_get_group_width (GtkCellAreaBoxContext *box_context,
-                                           gint                   group_idx,
-                                           gint                  *minimum_width,
-                                           gint                  *natural_width)
+                                           int                    group_idx,
+                                           int                   *minimum_width,
+                                           int                   *natural_width)
 {
   GtkCellAreaBoxContextPrivate *priv;
   CachedSize                   *size;
@@ -570,10 +570,10 @@ _gtk_cell_area_box_context_get_group_width (GtkCellAreaBoxContext *box_context,
 
 void
 _gtk_cell_area_box_context_get_group_height_for_width (GtkCellAreaBoxContext *box_context,
-                                                      gint                   group_idx,
-                                                      gint                   for_width,
-                                                      gint                  *minimum_height,
-                                                      gint                  *natural_height)
+                                                      int                    group_idx,
+                                                      int                    for_width,
+                                                      int                   *minimum_height,
+                                                      int                   *natural_height)
 {
   GtkCellAreaBoxContextPrivate *priv;
   GArray                    *group_array;
@@ -607,9 +607,9 @@ _gtk_cell_area_box_context_get_group_height_for_width (GtkCellAreaBoxContext *bo
 
 void
 _gtk_cell_area_box_context_get_group_height (GtkCellAreaBoxContext *box_context,
-                                            gint                   group_idx,
-                                            gint                  *minimum_height,
-                                            gint                  *natural_height)
+                                            int                    group_idx,
+                                            int                   *minimum_height,
+                                            int                   *natural_height)
 {
   GtkCellAreaBoxContextPrivate *priv;
   CachedSize                   *size;
@@ -630,10 +630,10 @@ _gtk_cell_area_box_context_get_group_height (GtkCellAreaBoxContext *box_context,
 
 void
 _gtk_cell_area_box_context_get_group_width_for_height (GtkCellAreaBoxContext *box_context,
-                                                      gint                   group_idx,
-                                                      gint                   for_height,
-                                                      gint                  *minimum_width,
-                                                      gint                  *natural_width)
+                                                      int                    group_idx,
+                                                      int                    for_height,
+                                                      int                   *minimum_width,
+                                                      int                   *natural_width)
 {
   GtkCellAreaBoxContextPrivate *priv;
   GArray                       *group_array;
@@ -669,16 +669,16 @@ static GtkRequestedSize *
 _gtk_cell_area_box_context_get_requests (GtkCellAreaBoxContext *box_context,
                                         GtkCellAreaBox        *area,
                                         GtkOrientation         orientation,
-                                        gint                   for_size,
-                                        gint                  *n_requests)
+                                        int                    for_size,
+                                        int                   *n_requests)
 {
   GtkCellAreaBoxContextPrivate *priv = box_context->priv;
   GtkRequestedSize             *requests;
   GArray                       *array;
   CachedSize                   *size;
-  gint                          visible_groups = 0;
-  gint                          last_aligned_group_idx = 0;
-  gint                          i, j;
+  int                           visible_groups = 0;
+  int                           last_aligned_group_idx = 0;
+  int                           i, j;
 
   /* Get the last visible aligned group 
    * (we need to get space at least up till this group) */
@@ -730,18 +730,18 @@ static GtkCellAreaBoxAllocation *
 allocate_for_orientation (GtkCellAreaBoxContext *context,
                           GtkCellAreaBox        *area,
                           GtkOrientation         orientation,
-                          gint                   spacing,
-                          gint                   size,
-                          gint                   for_size,
-                          gint                  *n_allocs)
+                          int                    spacing,
+                          int                    size,
+                          int                    for_size,
+                          int                   *n_allocs)
 {
   GtkCellAreaBoxContextPrivate *priv = context->priv;
   GtkCellAreaBoxAllocation     *allocs;
   GtkRequestedSize             *sizes;
-  gint                          n_expand_groups = 0;
-  gint                          i, n_groups, position, vis_position;
-  gint                          extra_size, extra_extra;
-  gint                          avail_size = size;
+  int                           n_expand_groups = 0;
+  int                           i, n_groups, position, vis_position;
+  int                           extra_size, extra_extra;
+  int                           avail_size = size;
 
   sizes           = _gtk_cell_area_box_context_get_requests (context, area, orientation, for_size, &n_groups);
   n_expand_groups = count_expand_groups (context);
@@ -807,7 +807,7 @@ allocate_for_orientation (GtkCellAreaBoxContext *context,
 
 GtkRequestedSize *
 _gtk_cell_area_box_context_get_widths (GtkCellAreaBoxContext *box_context,
-                                      gint                  *n_widths)
+                                      int                   *n_widths)
 {
   GtkCellAreaBox *area = (GtkCellAreaBox *)gtk_cell_area_context_get_area (GTK_CELL_AREA_CONTEXT (box_context));
 
@@ -816,7 +816,7 @@ _gtk_cell_area_box_context_get_widths (GtkCellAreaBoxContext *box_context,
 
 GtkRequestedSize *
 _gtk_cell_area_box_context_get_heights (GtkCellAreaBoxContext *box_context,
-                                       gint                  *n_heights)
+                                       int                   *n_heights)
 {
   GtkCellAreaBox *area = (GtkCellAreaBox *)gtk_cell_area_context_get_area (GTK_CELL_AREA_CONTEXT (box_context));
 
@@ -825,12 +825,12 @@ _gtk_cell_area_box_context_get_heights (GtkCellAreaBoxContext *box_context,
 
 GtkCellAreaBoxAllocation *
 _gtk_cell_area_box_context_get_orientation_allocs (GtkCellAreaBoxContext *context,
-                                                  gint                  *n_allocs)
+                                                  int                   *n_allocs)
 {
   GtkCellAreaContext       *ctx  = GTK_CELL_AREA_CONTEXT (context);
   GtkCellAreaBox           *area;
   GtkOrientation            orientation;
-  gint                      spacing, width, height, alloc_count = 0;
+  int                       spacing, width, height, alloc_count = 0;
   GtkCellAreaBoxAllocation *allocs = NULL;
 
   area        = (GtkCellAreaBox *)gtk_cell_area_context_get_area (ctx);
index 5feb7e6313fb5825fa2f9b50027d32c5b2dd28ed..104a0218be091fd914c0f374804b7410249e38bc 100644 (file)
@@ -72,65 +72,65 @@ void    _gtk_cell_area_box_init_groups                         (GtkCellAreaBoxCo
 
 /* Update cell-group sizes */
 void    _gtk_cell_area_box_context_push_group_width             (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                   minimum_width,
-                                                                gint                   natural_width);
+                                                                int                    group_idx,
+                                                                int                    minimum_width,
+                                                                int                    natural_width);
 
 void    _gtk_cell_area_box_context_push_group_height_for_width  (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                   for_width,
-                                                                gint                   minimum_height,
-                                                                gint                   natural_height);
+                                                                int                    group_idx,
+                                                                int                    for_width,
+                                                                int                    minimum_height,
+                                                                int                    natural_height);
 
 void    _gtk_cell_area_box_context_push_group_height            (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                   minimum_height,
-                                                                gint                   natural_height);
+                                                                int                    group_idx,
+                                                                int                    minimum_height,
+                                                                int                    natural_height);
 
 void    _gtk_cell_area_box_context_push_group_width_for_height  (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                   for_height,
-                                                                gint                   minimum_width,
-                                                                gint                   natural_width);
+                                                                int                    group_idx,
+                                                                int                    for_height,
+                                                                int                    minimum_width,
+                                                                int                    natural_width);
 
 /* Fetch cell-group sizes */
 void    _gtk_cell_area_box_context_get_group_width              (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                  *minimum_width,
-                                                                gint                  *natural_width);
+                                                                int                    group_idx,
+                                                                int                   *minimum_width,
+                                                                int                   *natural_width);
 
 void    _gtk_cell_area_box_context_get_group_height_for_width   (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                   for_width,
-                                                                gint                  *minimum_height,
-                                                                gint                  *natural_height);
+                                                                int                    group_idx,
+                                                                int                    for_width,
+                                                                int                   *minimum_height,
+                                                                int                   *natural_height);
 
 void    _gtk_cell_area_box_context_get_group_height             (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                  *minimum_height,
-                                                                gint                  *natural_height);
+                                                                int                    group_idx,
+                                                                int                   *minimum_height,
+                                                                int                   *natural_height);
 
 void    _gtk_cell_area_box_context_get_group_width_for_height   (GtkCellAreaBoxContext *box_context,
-                                                                gint                   group_idx,
-                                                                gint                   for_height,
-                                                                gint                  *minimum_width,
-                                                                gint                  *natural_width);
+                                                                int                    group_idx,
+                                                                int                    for_height,
+                                                                int                   *minimum_width,
+                                                                int                   *natural_width);
 
 GtkRequestedSize *_gtk_cell_area_box_context_get_widths         (GtkCellAreaBoxContext *box_context,
-                                                                gint                  *n_widths);
+                                                                int                   *n_widths);
 GtkRequestedSize *_gtk_cell_area_box_context_get_heights        (GtkCellAreaBoxContext *box_context,
-                                                                gint                  *n_heights);
+                                                                int                   *n_heights);
 
 /* Private context/area interaction */
 typedef struct {
-  gint group_idx; /* Groups containing only invisible cells are not allocated */
-  gint position;  /* Relative group allocation position in the orientation of the box */
-  gint size;      /* Full allocated size of the cells in this group spacing inclusive */
+  int group_idx; /* Groups containing only invisible cells are not allocated */
+  int position;  /* Relative group allocation position in the orientation of the box */
+  int size;      /* Full allocated size of the cells in this group spacing inclusive */
 } GtkCellAreaBoxAllocation;
 
 GtkCellAreaBoxAllocation *
 _gtk_cell_area_box_context_get_orientation_allocs (GtkCellAreaBoxContext *context,
-                                                  gint                  *n_allocs);
+                                                  int                   *n_allocs);
 
 G_END_DECLS
 
index 64b54f78f0b51b11aed7110ffc294c8d3454f0f8..d0c189aec60674853a20e751898cb0939a208321 100644 (file)
@@ -56,20 +56,20 @@ static void gtk_cell_area_context_set_property  (GObject            *object,
 /* GtkCellAreaContextClass */
 static void gtk_cell_area_context_real_reset    (GtkCellAreaContext *context);
 static void gtk_cell_area_context_real_allocate (GtkCellAreaContext *context,
-                                                 gint                width,
-                                                 gint                height);
+                                                 int                 width,
+                                                 int                 height);
 
 typedef struct _GtkCellAreaContextPrivate GtkCellAreaContextPrivate;
 struct _GtkCellAreaContextPrivate
 {
   GtkCellArea *cell_area;
 
-  gint         min_width;
-  gint         nat_width;
-  gint         min_height;
-  gint         nat_height;
-  gint         alloc_width;
-  gint         alloc_height;
+  int          min_width;
+  int          nat_width;
+  int          min_height;
+  int          nat_height;
+  int          alloc_width;
+  int          alloc_height;
 };
 
 enum {
@@ -289,8 +289,8 @@ gtk_cell_area_context_real_reset (GtkCellAreaContext *context)
 
 static void
 gtk_cell_area_context_real_allocate (GtkCellAreaContext *context,
-                                     gint                width,
-                                     gint                height)
+                                     int                 width,
+                                     int                 height)
 {
   GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context);
 
@@ -384,8 +384,8 @@ gtk_cell_area_context_reset (GtkCellAreaContext *context)
  */
 void
 gtk_cell_area_context_allocate (GtkCellAreaContext *context,
-                                gint                width,
-                                gint                height)
+                                int                 width,
+                                int                 height)
 {
   g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context));
 
@@ -408,8 +408,8 @@ gtk_cell_area_context_allocate (GtkCellAreaContext *context,
  */
 void
 gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context,
-                                           gint               *minimum_width,
-                                           gint               *natural_width)
+                                           int                *minimum_width,
+                                           int                *natural_width)
 {
   GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context);
 
@@ -438,8 +438,8 @@ gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context,
  */
 void
 gtk_cell_area_context_get_preferred_height (GtkCellAreaContext *context,
-                                            gint               *minimum_height,
-                                            gint               *natural_height)
+                                            int                *minimum_height,
+                                            int                *natural_height)
 {
   GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context);
 
@@ -469,9 +469,9 @@ gtk_cell_area_context_get_preferred_height (GtkCellAreaContext *context,
  */
 void
 gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *context,
-                                                      gint                width,
-                                                      gint               *minimum_height,
-                                                      gint               *natural_height)
+                                                      int                 width,
+                                                      int                *minimum_height,
+                                                      int                *natural_height)
 {
   g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context));
 
@@ -499,9 +499,9 @@ gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *contex
  */
 void
 gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *context,
-                                                      gint                height,
-                                                      gint               *minimum_width,
-                                                      gint               *natural_width)
+                                                      int                 height,
+                                                      int                *minimum_width,
+                                                      int                *natural_width)
 {
   g_return_if_fail (GTK_IS_CELL_AREA_CONTEXT (context));
 
@@ -526,8 +526,8 @@ gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *contex
  */
 void
 gtk_cell_area_context_get_allocation (GtkCellAreaContext *context,
-                                      gint               *width,
-                                      gint               *height)
+                                      int                *width,
+                                      int                *height)
 {
   GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context);
 
@@ -556,8 +556,8 @@ gtk_cell_area_context_get_allocation (GtkCellAreaContext *context,
  */
 void
 gtk_cell_area_context_push_preferred_width (GtkCellAreaContext *context,
-                                            gint                minimum_width,
-                                            gint                natural_width)
+                                            int                 minimum_width,
+                                            int                 natural_width)
 {
   GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context);
 
@@ -598,8 +598,8 @@ gtk_cell_area_context_push_preferred_width (GtkCellAreaContext *context,
  */
 void
 gtk_cell_area_context_push_preferred_height (GtkCellAreaContext *context,
-                                             gint                minimum_height,
-                                             gint                natural_height)
+                                             int                 minimum_height,
+                                             int                 natural_height)
 {
   GtkCellAreaContextPrivate *priv = gtk_cell_area_context_get_instance_private (context);
 
index bc3e7fb7dd12aa2fb85558714a7f1926840b07fe..6a856613cb0e0f2c3a05c7c4dbff717dc3d5bcdf 100644 (file)
@@ -66,17 +66,17 @@ struct _GtkCellAreaContextClass
 
   /*< public >*/
   void    (* allocate)                       (GtkCellAreaContext *context,
-                                              gint                width,
-                                              gint                height);
+                                              int                 width,
+                                              int                 height);
   void    (* reset)                          (GtkCellAreaContext *context);
   void    (* get_preferred_height_for_width) (GtkCellAreaContext *context,
-                                              gint                width,
-                                              gint               *minimum_height,
-                                              gint               *natural_height);
+                                              int                 width,
+                                              int                *minimum_height,
+                                              int                *natural_height);
   void    (* get_preferred_width_for_height) (GtkCellAreaContext *context,
-                                              gint                height,
-                                              gint               *minimum_width,
-                                              gint               *natural_width);
+                                              int                 height,
+                                              int                *minimum_width,
+                                              int                *natural_width);
 
   /*< private >*/
 
@@ -91,8 +91,8 @@ GDK_AVAILABLE_IN_ALL
 GtkCellArea *gtk_cell_area_context_get_area                        (GtkCellAreaContext *context);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_allocate                        (GtkCellAreaContext *context,
-                                                                    gint                width,
-                                                                    gint                height);
+                                                                    int                 width,
+                                                                    int                 height);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_reset                           (GtkCellAreaContext *context);
 
@@ -101,38 +101,38 @@ void         gtk_cell_area_context_reset                           (GtkCellAreaC
  */
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_width            (GtkCellAreaContext *context,
-                                                                   gint               *minimum_width,
-                                                                   gint               *natural_width);
+                                                                   int                *minimum_width,
+                                                                   int                *natural_width);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_height           (GtkCellAreaContext *context,
-                                                                   gint               *minimum_height,
-                                                                   gint               *natural_height);
+                                                                   int                *minimum_height,
+                                                                   int                *natural_height);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *context,
-                                                                   gint                width,
-                                                                   gint               *minimum_height,
-                                                                   gint               *natural_height);
+                                                                   int                 width,
+                                                                   int                *minimum_height,
+                                                                   int                *natural_height);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *context,
-                                                                   gint                height,
-                                                                   gint               *minimum_width,
-                                                                   gint               *natural_width);
+                                                                   int                 height,
+                                                                   int                *minimum_width,
+                                                                   int                *natural_width);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_get_allocation                 (GtkCellAreaContext *context,
-                                                                   gint               *width,
-                                                                   gint               *height);
+                                                                   int                *width,
+                                                                   int                *height);
 
 /* Apis for GtkCellArea implementations to update cached values
  * for multiple GtkTreeModel rows
  */
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_push_preferred_width  (GtkCellAreaContext *context,
-                                                          gint                minimum_width,
-                                                          gint                natural_width);
+                                                          int                 minimum_width,
+                                                          int                 natural_width);
 GDK_AVAILABLE_IN_ALL
 void         gtk_cell_area_context_push_preferred_height (GtkCellAreaContext *context,
-                                                          gint                minimum_height,
-                                                          gint                natural_height);
+                                                          int                 minimum_height,
+                                                          int                 natural_height);
 
 G_END_DECLS
 
index 4f7329895c547211c291cf7c1753918f2e2b9122..b146f42da9257b66653564f4528cc226ea08f8a0 100644 (file)
@@ -149,7 +149,7 @@ static void   gtk_cell_layout_default_clear              (GtkCellLayout
 static void   gtk_cell_layout_default_add_attribute      (GtkCellLayout         *cell_layout,
                                                          GtkCellRenderer       *cell,
                                                          const gchar           *attribute,
-                                                         gint                   column);
+                                                         int                    column);
 static void   gtk_cell_layout_default_set_cell_data_func (GtkCellLayout         *cell_layout,
                                                          GtkCellRenderer       *cell,
                                                          GtkCellLayoutDataFunc  func,
@@ -159,7 +159,7 @@ static void   gtk_cell_layout_default_clear_attributes   (GtkCellLayout
                                                          GtkCellRenderer       *cell);
 static void   gtk_cell_layout_default_reorder            (GtkCellLayout         *cell_layout,
                                                          GtkCellRenderer       *cell,
-                                                         gint                   position);
+                                                         int                    position);
 static GList *gtk_cell_layout_default_get_cells          (GtkCellLayout         *cell_layout);
 
 
@@ -242,7 +242,7 @@ static void
 gtk_cell_layout_default_add_attribute (GtkCellLayout         *cell_layout,
                                       GtkCellRenderer       *cell,
                                       const gchar           *attribute,
-                                      gint                   column)
+                                      int                    column)
 {
   GtkCellLayoutIface *iface;
   GtkCellArea        *area;
@@ -308,7 +308,7 @@ gtk_cell_layout_default_clear_attributes (GtkCellLayout         *cell_layout,
 static void
 gtk_cell_layout_default_reorder (GtkCellLayout         *cell_layout,
                                 GtkCellRenderer       *cell,
-                                gint                   position)
+                                int                    position)
 {
   GtkCellLayoutIface *iface;
   GtkCellArea        *area;
@@ -414,7 +414,7 @@ gtk_cell_layout_set_attributesv (GtkCellLayout   *cell_layout,
                                  va_list          args)
 {
   gchar *attribute;
-  gint column;
+  int column;
 
   attribute = va_arg (args, gchar *);
 
@@ -422,7 +422,7 @@ gtk_cell_layout_set_attributesv (GtkCellLayout   *cell_layout,
 
   while (attribute != NULL)
     {
-      column = va_arg (args, gint);
+      column = va_arg (args, int);
 
       gtk_cell_layout_add_attribute (cell_layout, cell, attribute, column);
 
@@ -475,7 +475,7 @@ void
 gtk_cell_layout_add_attribute (GtkCellLayout   *cell_layout,
                                GtkCellRenderer *cell,
                                const gchar     *attribute,
-                               gint             column)
+                               int              column)
 {
   g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
@@ -547,7 +547,7 @@ gtk_cell_layout_clear_attributes (GtkCellLayout   *cell_layout,
 void
 gtk_cell_layout_reorder (GtkCellLayout   *cell_layout,
                          GtkCellRenderer *cell,
-                         gint             position)
+                         int              position)
 {
   g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout));
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
index ccad30c6a3c49d4e6d3e35b43bdf6818945e7897..4eab78ab22f3ae7cec04c6f6e8ca95b3c0b5875b 100644 (file)
@@ -92,7 +92,7 @@ struct _GtkCellLayoutIface
   void (* add_attribute)      (GtkCellLayout         *cell_layout,
                                GtkCellRenderer       *cell,
                                const gchar           *attribute,
-                               gint                   column);
+                               int                    column);
   void (* set_cell_data_func) (GtkCellLayout         *cell_layout,
                                GtkCellRenderer       *cell,
                                GtkCellLayoutDataFunc  func,
@@ -102,7 +102,7 @@ struct _GtkCellLayoutIface
                                GtkCellRenderer       *cell);
   void (* reorder)            (GtkCellLayout         *cell_layout,
                                GtkCellRenderer       *cell,
-                               gint                   position);
+                               int                    position);
   GList* (* get_cells)        (GtkCellLayout         *cell_layout);
 
   GtkCellArea *(* get_area)   (GtkCellLayout         *cell_layout);
@@ -130,7 +130,7 @@ GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_add_attribute      (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
                                           const gchar           *attribute,
-                                          gint                   column);
+                                          int                    column);
 GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_set_cell_data_func (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
@@ -143,7 +143,7 @@ void  gtk_cell_layout_clear_attributes   (GtkCellLayout         *cell_layout,
 GDK_AVAILABLE_IN_ALL
 void  gtk_cell_layout_reorder            (GtkCellLayout         *cell_layout,
                                           GtkCellRenderer       *cell,
-                                          gint                   position);
+                                          int                    position);
 GDK_AVAILABLE_IN_ALL
 GtkCellArea *gtk_cell_layout_get_area    (GtkCellLayout         *cell_layout);
 
index 544880a45b87f8db1085d63bd26685df3563ae48..df98722ec45568eb90973dd1336a75898a13c528 100644 (file)
@@ -93,22 +93,22 @@ static void set_cell_bg_color               (GtkCellRenderer      *cell,
 static GtkSizeRequestMode gtk_cell_renderer_real_get_request_mode(GtkCellRenderer         *cell);
 static void gtk_cell_renderer_real_get_preferred_width           (GtkCellRenderer         *cell,
                                                                   GtkWidget               *widget,
-                                                                  gint                    *minimum_size,
-                                                                  gint                    *natural_size);
+                                                                  int                     *minimum_size,
+                                                                  int                     *natural_size);
 static void gtk_cell_renderer_real_get_preferred_height          (GtkCellRenderer         *cell,
                                                                   GtkWidget               *widget,
-                                                                  gint                    *minimum_size,
-                                                                  gint                    *natural_size);
+                                                                  int                     *minimum_size,
+                                                                  int                     *natural_size);
 static void gtk_cell_renderer_real_get_preferred_height_for_width(GtkCellRenderer         *cell,
                                                                   GtkWidget               *widget,
-                                                                  gint                     width,
-                                                                  gint                    *minimum_height,
-                                                                  gint                    *natural_height);
+                                                                  int                      width,
+                                                                  int                     *minimum_height,
+                                                                  int                     *natural_height);
 static void gtk_cell_renderer_real_get_preferred_width_for_height(GtkCellRenderer         *cell,
                                                                   GtkWidget               *widget,
-                                                                  gint                     height,
-                                                                  gint                    *minimum_width,
-                                                                  gint                    *natural_width);
+                                                                  int                      height,
+                                                                  int                     *minimum_width,
+                                                                  int                     *natural_width);
 static void gtk_cell_renderer_real_get_aligned_area              (GtkCellRenderer         *cell,
                                                                  GtkWidget               *widget,
                                                                  GtkCellRendererState     flags,
@@ -121,8 +121,8 @@ struct _GtkCellRendererPrivate
   gfloat xalign;
   gfloat yalign;
 
-  gint width;
-  gint height;
+  int width;
+  int height;
 
   guint16 xpad;
   guint16 ypad;
@@ -169,7 +169,7 @@ enum {
   LAST_SIGNAL
 };
 
-static gint GtkCellRenderer_private_offset;
+static int GtkCellRenderer_private_offset;
 static guint  cell_renderer_signals[LAST_SIGNAL] = { 0 };
 
 static inline gpointer
@@ -866,8 +866,8 @@ gtk_cell_renderer_start_editing (GtkCellRenderer      *cell,
  **/
 void
 gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell,
-                                 gint             width,
-                                 gint             height)
+                                 int              width,
+                                 int              height)
 {
   GtkCellRendererPrivate *priv;
 
@@ -906,8 +906,8 @@ gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell,
  **/
 void
 gtk_cell_renderer_get_fixed_size (GtkCellRenderer *cell,
-                                 gint            *width,
-                                 gint            *height)
+                                 int             *width,
+                                 int             *height)
 {
   GtkCellRendererPrivate *priv;
 
@@ -997,8 +997,8 @@ gtk_cell_renderer_get_alignment (GtkCellRenderer *cell,
  **/
 void
 gtk_cell_renderer_set_padding (GtkCellRenderer *cell,
-                               gint             xpad,
-                               gint             ypad)
+                               int              xpad,
+                               int              ypad)
 {
   GtkCellRendererPrivate *priv;
 
@@ -1037,8 +1037,8 @@ gtk_cell_renderer_set_padding (GtkCellRenderer *cell,
  **/
 void
 gtk_cell_renderer_get_padding (GtkCellRenderer *cell,
-                               gint            *xpad,
-                               gint            *ypad)
+                               int             *xpad,
+                               int             *ypad)
 {
   GtkCellRendererPrivate *priv;
 
@@ -1191,8 +1191,8 @@ static void
 gtk_cell_renderer_real_get_preferred_size (GtkCellRenderer   *cell,
                                            GtkWidget         *widget,
                                            GtkOrientation     orientation,
-                                           gint              *minimum_size,
-                                           gint              *natural_size)
+                                           int               *minimum_size,
+                                           int               *natural_size)
 {
   GtkRequisition min_req;
 
@@ -1234,8 +1234,8 @@ gtk_cell_renderer_real_get_request_mode (GtkCellRenderer *cell)
 static void
 gtk_cell_renderer_real_get_preferred_width (GtkCellRenderer *cell,
                                             GtkWidget       *widget,
-                                            gint            *minimum_size,
-                                            gint            *natural_size)
+                                            int             *minimum_size,
+                                            int             *natural_size)
 {
   gtk_cell_renderer_real_get_preferred_size (cell, widget, GTK_ORIENTATION_HORIZONTAL, 
                                              minimum_size, natural_size);
@@ -1244,8 +1244,8 @@ gtk_cell_renderer_real_get_preferred_width (GtkCellRenderer *cell,
 static void
 gtk_cell_renderer_real_get_preferred_height (GtkCellRenderer *cell,
                                              GtkWidget       *widget,
-                                             gint            *minimum_size,
-                                             gint            *natural_size)
+                                             int             *minimum_size,
+                                             int             *natural_size)
 {
   gtk_cell_renderer_real_get_preferred_size (cell, widget, GTK_ORIENTATION_VERTICAL, 
                                              minimum_size, natural_size);
@@ -1255,9 +1255,9 @@ gtk_cell_renderer_real_get_preferred_height (GtkCellRenderer *cell,
 static void
 gtk_cell_renderer_real_get_preferred_height_for_width (GtkCellRenderer *cell,
                                                        GtkWidget       *widget,
-                                                       gint             width,
-                                                       gint            *minimum_height,
-                                                       gint            *natural_height)
+                                                       int              width,
+                                                       int             *minimum_height,
+                                                       int             *natural_height)
 {
   /* Fall back on the height reported from ->get_size() */
   gtk_cell_renderer_get_preferred_height (cell, widget, minimum_height, natural_height);
@@ -1266,9 +1266,9 @@ gtk_cell_renderer_real_get_preferred_height_for_width (GtkCellRenderer *cell,
 static void
 gtk_cell_renderer_real_get_preferred_width_for_height (GtkCellRenderer *cell,
                                                        GtkWidget       *widget,
-                                                       gint             height,
-                                                       gint            *minimum_width,
-                                                       gint            *natural_width)
+                                                       int              height,
+                                                       int             *minimum_width,
+                                                       int             *natural_width)
 {
   /* Fall back on the width reported from ->get_size() */
   gtk_cell_renderer_get_preferred_width (cell, widget, minimum_width, natural_width);
@@ -1285,8 +1285,8 @@ gtk_cell_renderer_real_get_aligned_area (GtkCellRenderer         *cell,
                                         const GdkRectangle      *cell_area,
                                         GdkRectangle            *aligned_area)
 {
-  gint opposite_size, x_offset, y_offset;
-  gint natural_size;
+  int opposite_size, x_offset, y_offset;
+  int natural_size;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1345,10 +1345,10 @@ void
 _gtk_cell_renderer_calc_offset    (GtkCellRenderer      *cell,
                                   const GdkRectangle   *cell_area,
                                   GtkTextDirection      direction,
-                                  gint                  width,
-                                  gint                  height,
-                                  gint                 *x_offset,
-                                  gint                 *y_offset)
+                                  int                   width,
+                                  int                   height,
+                                  int                  *x_offset,
+                                  int                  *y_offset)
 { 
   GtkCellRendererPrivate *priv;
 
@@ -1402,11 +1402,11 @@ gtk_cell_renderer_get_request_mode (GtkCellRenderer *cell)
 void
 gtk_cell_renderer_get_preferred_width (GtkCellRenderer *cell,
                                        GtkWidget       *widget,
-                                       gint            *minimum_size,
-                                       gint            *natural_size)
+                                       int             *minimum_size,
+                                       int             *natural_size)
 {
   GtkCellRendererClass *klass;
-  gint width;
+  int width;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1448,11 +1448,11 @@ gtk_cell_renderer_get_preferred_width (GtkCellRenderer *cell,
 void
 gtk_cell_renderer_get_preferred_height (GtkCellRenderer *cell,
                                         GtkWidget       *widget,
-                                        gint            *minimum_size,
-                                        gint            *natural_size)
+                                        int             *minimum_size,
+                                        int             *natural_size)
 {
   GtkCellRendererClass *klass;
-  gint height;
+  int height;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1496,12 +1496,12 @@ gtk_cell_renderer_get_preferred_height (GtkCellRenderer *cell,
 void
 gtk_cell_renderer_get_preferred_width_for_height (GtkCellRenderer *cell,
                                                   GtkWidget       *widget,
-                                                  gint             height,
-                                                  gint            *minimum_width,
-                                                  gint            *natural_width)
+                                                  int              height,
+                                                  int             *minimum_width,
+                                                  int             *natural_width)
 {
   GtkCellRendererClass *klass;
-  gint width;
+  int width;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1544,12 +1544,12 @@ gtk_cell_renderer_get_preferred_width_for_height (GtkCellRenderer *cell,
 void
 gtk_cell_renderer_get_preferred_height_for_width (GtkCellRenderer *cell,
                                                   GtkWidget       *widget,
-                                                  gint             width,
-                                                  gint            *minimum_height,
-                                                  gint            *natural_height)
+                                                  int              width,
+                                                  int             *minimum_height,
+                                                  int             *natural_height)
 {
   GtkCellRendererClass *klass;
-  gint height;
+  int height;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
   g_return_if_fail (GTK_IS_WIDGET (widget));
@@ -1594,8 +1594,8 @@ gtk_cell_renderer_get_preferred_size (GtkCellRenderer *cell,
                                       GtkRequisition  *minimum_size,
                                       GtkRequisition  *natural_size)
 {
-  gint min_width, nat_width;
-  gint min_height, nat_height;
+  int min_width, nat_width;
+  int min_height, nat_height;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
 
index cfc68ff79d57c0916aad323a3298350788c929fa..6fb00ec9fc963ad193fbe83745586e032e24e859 100644 (file)
@@ -117,22 +117,22 @@ struct _GtkCellRendererClass
   GtkSizeRequestMode (* get_request_mode)                (GtkCellRenderer      *cell);
   void               (* get_preferred_width)             (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
-                                                          gint                 *minimum_size,
-                                                          gint                 *natural_size);
+                                                          int                  *minimum_size,
+                                                          int                  *natural_size);
   void               (* get_preferred_height_for_width)  (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
-                                                          gint                  width,
-                                                          gint                 *minimum_height,
-                                                          gint                 *natural_height);
+                                                          int                   width,
+                                                          int                  *minimum_height,
+                                                          int                  *natural_height);
   void               (* get_preferred_height)            (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
-                                                          gint                 *minimum_size,
-                                                          gint                 *natural_size);
+                                                          int                  *minimum_size,
+                                                          int                  *natural_size);
   void               (* get_preferred_width_for_height)  (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
-                                                          gint                  height,
-                                                          gint                 *minimum_width,
-                                                          gint                 *natural_width);
+                                                          int                   height,
+                                                          int                  *minimum_width,
+                                                          int                  *natural_width);
   void               (* get_aligned_area)                (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
                                                          GtkCellRendererState  flags,
@@ -141,10 +141,10 @@ struct _GtkCellRendererClass
   void               (* get_size)                        (GtkCellRenderer      *cell,
                                                           GtkWidget            *widget,
                                                           const GdkRectangle   *cell_area,
-                                                          gint                 *x_offset,
-                                                          gint                 *y_offset,
-                                                          gint                 *width,
-                                                          gint                 *height);
+                                                          int                  *x_offset,
+                                                          int                  *y_offset,
+                                                          int                  *width,
+                                                          int                  *height);
   void               (* snapshot)                        (GtkCellRenderer      *cell,
                                                           GtkSnapshot          *snapshot,
                                                           GtkWidget            *widget,
@@ -187,25 +187,25 @@ GtkSizeRequestMode gtk_cell_renderer_get_request_mode               (GtkCellRend
 GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_width            (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
-                                                                     gint               *minimum_size,
-                                                                     gint               *natural_size);
+                                                                     int                *minimum_size,
+                                                                     int                *natural_size);
 GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_height_for_width (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
-                                                                     gint                width,
-                                                                     gint               *minimum_height,
-                                                                     gint               *natural_height);
+                                                                     int                 width,
+                                                                     int                *minimum_height,
+                                                                     int                *natural_height);
 GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_height           (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
-                                                                     gint               *minimum_size,
-                                                                     gint               *natural_size);
+                                                                     int                *minimum_size,
+                                                                     int                *natural_size);
 GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_width_for_height (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
-                                                                     gint                height,
-                                                                     gint               *minimum_width,
-                                                                     gint               *natural_width);
+                                                                     int                 height,
+                                                                     int                *minimum_width,
+                                                                     int                *natural_width);
 GDK_AVAILABLE_IN_ALL
 void               gtk_cell_renderer_get_preferred_size             (GtkCellRenderer    *cell,
                                                                      GtkWidget          *widget,
@@ -243,12 +243,12 @@ GtkCellEditable *gtk_cell_renderer_start_editing  (GtkCellRenderer      *cell,
 
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_fixed_size (GtkCellRenderer      *cell,
-                                                  gint                  width,
-                                                  gint                  height);
+                                                  int                   width,
+                                                  int                   height);
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_get_fixed_size (GtkCellRenderer      *cell,
-                                                  gint                 *width,
-                                                  gint                 *height);
+                                                  int                  *width,
+                                                  int                  *height);
 
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_alignment  (GtkCellRenderer      *cell,
@@ -261,12 +261,12 @@ void             gtk_cell_renderer_get_alignment  (GtkCellRenderer      *cell,
 
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_padding    (GtkCellRenderer      *cell,
-                                                   gint                  xpad,
-                                                   gint                  ypad);
+                                                   int                   xpad,
+                                                   int                   ypad);
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_get_padding    (GtkCellRenderer      *cell,
-                                                   gint                 *xpad,
-                                                   gint                 *ypad);
+                                                   int                  *xpad,
+                                                   int                  *ypad);
 
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_set_visible    (GtkCellRenderer      *cell,
@@ -307,10 +307,10 @@ void             gtk_cell_renderer_stop_editing   (GtkCellRenderer      *cell,
 void            _gtk_cell_renderer_calc_offset    (GtkCellRenderer      *cell,
                                                    const GdkRectangle   *cell_area,
                                                    GtkTextDirection      direction,
-                                                   gint                  width,
-                                                   gint                  height,
-                                                   gint                 *x_offset,
-                                                   gint                 *y_offset);
+                                                   int                   width,
+                                                   int                   height,
+                                                   int                  *x_offset,
+                                                   int                  *y_offset);
 
 GDK_AVAILABLE_IN_ALL
 GtkStateFlags   gtk_cell_renderer_get_state       (GtkCellRenderer      *cell,
index 3c806270c68cc0342ed141d729796c25886fbee7..451924fd0b0cdb6921085711cf41eb2a1b4425c0 100644 (file)
@@ -56,8 +56,8 @@ static void gtk_cell_renderer_accel_set_property (GObject         *object,
 static void gtk_cell_renderer_accel_get_preferred_width 
                                                  (GtkCellRenderer *cell,
                                                   GtkWidget       *widget,
-                                                  gint            *minimum_size,
-                                                  gint            *natural_size);
+                                                  int             *minimum_size,
+                                                  int             *natural_size);
 static GtkCellEditable *
            gtk_cell_renderer_accel_start_editing (GtkCellRenderer      *cell,
                                                   GdkEvent             *event,
@@ -427,8 +427,8 @@ gtk_cell_renderer_accel_set_property (GObject      *object,
 static void
 gtk_cell_renderer_accel_get_preferred_width (GtkCellRenderer *cell,
                                              GtkWidget       *widget,
-                                             gint            *minimum_size,
-                                             gint            *natural_size)
+                                             int             *minimum_size,
+                                             int             *natural_size)
 
 {
   GtkCellRendererAccelPrivate *priv = gtk_cell_renderer_accel_get_instance_private (GTK_CELL_RENDERER_ACCEL (cell));
index 15c8b649f2cda7ffdf69b38d7493ad97d40a9cf5..8272857e441fb30856d975380385ef4a0c7a1570 100644 (file)
@@ -69,7 +69,7 @@ struct _GtkCellRendererComboPrivate
 
   gboolean has_entry;
 
-  gint text_column;
+  int text_column;
 
   gulong focus_out_id;
 };
index bb240bae91da9697eb5f8258bb65fa7305c5c844..8616478b0a4ec7389cc01962003ea1e5c4276498 100644 (file)
@@ -63,10 +63,10 @@ static void gtk_cell_renderer_pixbuf_set_property  (GObject                    *
 static void gtk_cell_renderer_pixbuf_get_size   (GtkCellRenderer            *cell,
                                                 GtkWidget                  *widget,
                                                 const GdkRectangle         *rectangle,
-                                                gint                       *x_offset,
-                                                gint                       *y_offset,
-                                                gint                       *width,
-                                                gint                       *height);
+                                                int                        *x_offset,
+                                                int                        *y_offset,
+                                                int                        *width,
+                                                int                        *height);
 static void gtk_cell_renderer_pixbuf_snapshot   (GtkCellRenderer            *cell,
                                                 GtkSnapshot                *snapshot,
                                                 GtkWidget                  *widget,
@@ -412,18 +412,18 @@ static void
 gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer    *cell,
                                   GtkWidget          *widget,
                                   const GdkRectangle *cell_area,
-                                  gint               *x_offset,
-                                  gint               *y_offset,
-                                  gint               *width,
-                                  gint               *height)
+                                  int                *x_offset,
+                                  int                *y_offset,
+                                  int                *width,
+                                  int                *height)
 {
   GtkCellRendererPixbuf *cellpixbuf = GTK_CELL_RENDERER_PIXBUF (cell);
   GtkCellRendererPixbufPrivate *priv = gtk_cell_renderer_pixbuf_get_instance_private (cellpixbuf);
-  gint pixbuf_width;
-  gint pixbuf_height;
-  gint calc_width;
-  gint calc_height;
-  gint xpad, ypad;
+  int pixbuf_width;
+  int pixbuf_height;
+  int calc_width;
+  int calc_height;
+  int xpad, ypad;
   GtkStyleContext *context;
   GtkIconHelper *icon_helper;
 
@@ -459,8 +459,8 @@ gtk_cell_renderer_pixbuf_get_size (GtkCellRenderer    *cell,
     }
 
   gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
-  calc_width  = (gint) xpad * 2 + pixbuf_width;
-  calc_height = (gint) ypad * 2 + pixbuf_height;
+  calc_width  = (int) xpad * 2 + pixbuf_width;
+  calc_height = (int) ypad * 2 + pixbuf_height;
   
   if (cell_area && pixbuf_width > 0 && pixbuf_height > 0)
     {
@@ -508,7 +508,7 @@ gtk_cell_renderer_pixbuf_snapshot (GtkCellRenderer      *cell,
   GtkStyleContext *context;
   GdkRectangle pix_rect;
   gboolean is_expander;
-  gint xpad, ypad;
+  int xpad, ypad;
   GtkIconHelper *icon_helper;
 
   gtk_cell_renderer_pixbuf_get_size (cell, widget, (GdkRectangle *) cell_area,
index bd2ae8bb0183ffa76cde0ff2a49e162203bc26a4..831f5ad2e0f507b72761ed138c82793ecbb61584 100644 (file)
@@ -73,13 +73,13 @@ struct _GtkCellRendererProgressClass
 
 struct _GtkCellRendererProgressPrivate
 {
-  gint value;
+  int value;
   gchar *text;
   gchar *label;
-  gint min_h;
-  gint min_w;
-  gint pulse;
-  gint offset;
+  int min_h;
+  int min_w;
+  int pulse;
+  int offset;
   gfloat text_xalign;
   gfloat text_yalign;
   GtkOrientation orientation;
@@ -96,23 +96,23 @@ static void gtk_cell_renderer_progress_set_property (GObject                 *ob
                                                     const GValue            *value,
                                                     GParamSpec              *pspec);
 static void gtk_cell_renderer_progress_set_value    (GtkCellRendererProgress *cellprogress,
-                                                    gint                     value);
+                                                    int                      value);
 static void gtk_cell_renderer_progress_set_text     (GtkCellRendererProgress *cellprogress,
                                                     const gchar             *text);
 static void gtk_cell_renderer_progress_set_pulse    (GtkCellRendererProgress *cellprogress,
-                                                    gint                     pulse);
+                                                    int                      pulse);
 static void compute_dimensions                      (GtkCellRenderer         *cell,
                                                     GtkWidget               *widget,
                                                     const gchar             *text,
-                                                    gint                    *width,
-                                                    gint                    *height);
+                                                    int                     *width,
+                                                    int                     *height);
 static void gtk_cell_renderer_progress_get_size     (GtkCellRenderer         *cell,
                                                     GtkWidget               *widget,
                                                     const GdkRectangle      *cell_area,
-                                                    gint                    *x_offset,
-                                                    gint                    *y_offset,
-                                                    gint                    *width,
-                                                    gint                    *height);
+                                                    int                     *x_offset,
+                                                    int                     *y_offset,
+                                                    int                     *width,
+                                                    int                     *height);
 static void gtk_cell_renderer_progress_snapshot     (GtkCellRenderer         *cell,
                                                     GtkSnapshot             *snapshot,
                                                     GtkWidget               *widget,
@@ -383,7 +383,7 @@ recompute_label (GtkCellRendererProgress *cellprogress)
 
 static void
 gtk_cell_renderer_progress_set_value (GtkCellRendererProgress *cellprogress, 
-                                     gint                     value)
+                                     int                      value)
 {
   GtkCellRendererProgressPrivate *priv = gtk_cell_renderer_progress_get_instance_private (cellprogress);
 
@@ -411,7 +411,7 @@ gtk_cell_renderer_progress_set_text (GtkCellRendererProgress *cellprogress,
 
 static void
 gtk_cell_renderer_progress_set_pulse (GtkCellRendererProgress *cellprogress, 
-                                     gint                     pulse)
+                                     int                      pulse)
 {
   GtkCellRendererProgressPrivate *priv = gtk_cell_renderer_progress_get_instance_private (cellprogress);
 
@@ -432,12 +432,12 @@ static void
 compute_dimensions (GtkCellRenderer *cell,
                    GtkWidget       *widget, 
                    const gchar     *text, 
-                   gint            *width, 
-                   gint            *height)
+                   int             *width, 
+                   int             *height)
 {
   PangoRectangle logical_rect;
   PangoLayout *layout;
-  gint xpad, ypad;
+  int xpad, ypad;
   
   layout = gtk_widget_create_pango_layout (widget, text);
   pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
@@ -457,14 +457,14 @@ static void
 gtk_cell_renderer_progress_get_size (GtkCellRenderer    *cell,
                                     GtkWidget          *widget,
                                     const GdkRectangle *cell_area,
-                                    gint               *x_offset,
-                                    gint               *y_offset,
-                                    gint               *width,
-                                    gint               *height)
+                                    int                *x_offset,
+                                    int                *y_offset,
+                                    int                *width,
+                                    int                *height)
 {
   GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS (cell);
   GtkCellRendererProgressPrivate *priv = gtk_cell_renderer_progress_get_instance_private (cellprogress);
-  gint w, h;
+  int w, h;
   gchar *text;
 
   if (priv->min_w < 0)
@@ -501,12 +501,12 @@ gtk_cell_renderer_progress_get_size (GtkCellRenderer    *cell,
   if (y_offset) *y_offset = 0;
 }
 
-static inline gint
-get_bar_size (gint pulse,
-             gint value,
-             gint full_size)
+static inline int
+get_bar_size (int pulse,
+             int value,
+             int full_size)
 {
-  gint bar_size;
+  int bar_size;
 
   if (pulse < 0)
     bar_size = full_size * MAX (0, value) / 100;
@@ -520,15 +520,15 @@ get_bar_size (gint pulse,
   return bar_size;
 }
 
-static inline gint
-get_bar_position (gint     start,
-                 gint     full_size,
-                 gint     bar_size,
-                 gint     pulse,
-                 gint     offset,
+static inline int
+get_bar_position (int      start,
+                 int      full_size,
+                 int      bar_size,
+                 int      pulse,
+                 int      offset,
                  gboolean is_rtl)
 {
-  gint position;
+  int position;
 
   if (pulse < 0 || pulse == 0 || pulse == G_MAXINT)
     {
@@ -559,8 +559,8 @@ gtk_cell_renderer_progress_snapshot (GtkCellRenderer      *cell,
   GtkBorder padding;
   PangoLayout *layout;
   PangoRectangle logical_rect;
-  gint x, y, w, h, x_pos, y_pos, bar_position, bar_size, start, full_size;
-  gint xpad, ypad;
+  int x, y, w, h, x_pos, y_pos, bar_position, bar_size, start, full_size;
+  int xpad, ypad;
   GdkRectangle clip;
   gboolean is_rtl;
 
index 3c429155a09cf541f4523961be6ca678e4bb101e..20c211a8ad90985c19a0ce6dd05edaee0468f952 100644 (file)
@@ -88,7 +88,7 @@ struct _GtkCellRendererSpinnerPrivate
   gboolean active;
   guint pulse;
   GtkIconSize icon_size;
-  gint size;
+  int size;
 };
 
 
@@ -103,10 +103,10 @@ static void gtk_cell_renderer_spinner_set_property (GObject         *object,
 static void gtk_cell_renderer_spinner_get_size     (GtkCellRenderer *cell,
                                                     GtkWidget          *widget,
                                                     const GdkRectangle *cell_area,
-                                                    gint               *x_offset,
-                                                    gint               *y_offset,
-                                                    gint               *width,
-                                                    gint               *height);
+                                                    int                *x_offset,
+                                                    int                *y_offset,
+                                                    int                *width,
+                                                    int                *height);
 static void gtk_cell_renderer_spinner_snapshot     (GtkCellRenderer      *cell,
                                                     GtkSnapshot          *snapshot,
                                                     GtkWidget            *widget,
@@ -281,16 +281,16 @@ static void
 gtk_cell_renderer_spinner_get_size (GtkCellRenderer    *cellr,
                                     GtkWidget          *widget,
                                     const GdkRectangle *cell_area,
-                                    gint               *x_offset,
-                                    gint               *y_offset,
-                                    gint               *width,
-                                    gint               *height)
+                                    int                *x_offset,
+                                    int                *y_offset,
+                                    int                *width,
+                                    int                *height)
 {
   GtkCellRendererSpinner *cell = GTK_CELL_RENDERER_SPINNER (cellr);
   GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
   gdouble align;
-  gint w, h;
-  gint xpad, ypad;
+  int w, h;
+  int xpad, ypad;
   gfloat xalign, yalign;
   gboolean rtl;
 
@@ -339,17 +339,17 @@ static void
 gtk_paint_spinner (GtkStyleContext *context,
                    cairo_t         *cr,
                    guint            step,
-                   gint             x,
-                   gint             y,
-                   gint             width,
-                   gint             height)
+                   int              x,
+                   int              y,
+                   int              width,
+                   int              height)
 {
   GdkRGBA color;
   guint num_steps;
   gdouble dx, dy;
   gdouble radius;
   gdouble half;
-  gint i;
+  int i;
   guint real_step;
 
   num_steps = 12;
@@ -372,7 +372,7 @@ gtk_paint_spinner (GtkStyleContext *context,
 
   for (i = 0; i < num_steps; i++)
     {
-      gint inset = 0.7 * radius;
+      int inset = 0.7 * radius;
 
       /* transparency is a function of time and initial value */
       gdouble t = (gdouble) ((i + num_steps - real_step)
@@ -411,7 +411,7 @@ gtk_cell_renderer_spinner_snapshot (GtkCellRenderer      *cellr,
   GtkCellRendererSpinnerPrivate *priv = gtk_cell_renderer_spinner_get_instance_private (cell);
   GdkRectangle pix_rect;
   GdkRectangle draw_rect;
-  gint xpad, ypad;
+  int xpad, ypad;
   cairo_t *cr;
 
   if (!priv->active)
index 1163616d7217ed0a07f4f29907e47e1a03bb7eb6..8e905ab9e88efcca068e254372ed068106246d53 100644 (file)
@@ -76,17 +76,17 @@ static GtkCellEditable *gtk_cell_renderer_text_start_editing (GtkCellRenderer
 
 static void       gtk_cell_renderer_text_get_preferred_width            (GtkCellRenderer       *cell,
                                                                          GtkWidget             *widget,
-                                                                         gint                  *minimal_size,
-                                                                         gint                  *natural_size);
+                                                                         int                   *minimal_size,
+                                                                         int                   *natural_size);
 static void       gtk_cell_renderer_text_get_preferred_height           (GtkCellRenderer       *cell,
                                                                          GtkWidget             *widget,
-                                                                         gint                  *minimal_size,
-                                                                         gint                  *natural_size);
+                                                                         int                   *minimal_size,
+                                                                         int                   *natural_size);
 static void       gtk_cell_renderer_text_get_preferred_height_for_width (GtkCellRenderer       *cell,
                                                                          GtkWidget             *widget,
-                                                                         gint                   width,
-                                                                         gint                  *minimum_height,
-                                                                         gint                  *natural_height);
+                                                                         int                    width,
+                                                                         int                   *minimum_height,
+                                                                         int                   *natural_height);
 static void       gtk_cell_renderer_text_get_aligned_area               (GtkCellRenderer       *cell,
                                                                         GtkWidget             *widget,
                                                                         GtkCellRendererState   flags,
@@ -183,11 +183,11 @@ struct _GtkCellRendererTextPrivate
 
   gdouble font_scale;
 
-  gint rise;
-  gint fixed_height_rows;
-  gint width_chars;
-  gint max_width_chars;
-  gint wrap_width;
+  int rise;
+  int fixed_height_rows;
+  int width_chars;
+  int max_width_chars;
+  int wrap_width;
 
   guint in_entry_menu     : 1;
   guint strikethrough     : 1;
@@ -951,7 +951,7 @@ set_font_desc_fields (PangoFontDescription *desc,
     pango_font_description_set_stretch (desc, pango_font_description_get_stretch (desc));
   if (to_set & PANGO_FONT_MASK_SIZE)
     {
-      gint size = pango_font_description_get_size (desc);
+      int size = pango_font_description_get_size (desc);
       if (size <= 0)
        {
          size = 10 * PANGO_SCALE;
@@ -1437,7 +1437,7 @@ get_layout (GtkCellRendererText *celltext,
   PangoAttrList *attr_list;
   PangoLayout *layout;
   PangoUnderline uline;
-  gint xpad;
+  int xpad;
   gboolean placeholder_layout = show_placeholder_text (celltext);
 
   layout = gtk_widget_create_pango_layout (widget, placeholder_layout ?
@@ -1562,7 +1562,7 @@ get_layout (GtkCellRendererText *celltext,
   if (priv->wrap_width != -1)
     {
       PangoRectangle rect;
-      gint           width, text_width;
+      int            width, text_width;
 
       pango_layout_get_extents (layout, NULL, &rect);
       text_width = rect.width;
@@ -1606,10 +1606,10 @@ get_size (GtkCellRenderer    *cell,
          GtkWidget          *widget,
          const GdkRectangle *cell_area,
          PangoLayout        *layout,
-         gint               *x_offset,
-         gint               *y_offset,
-         gint               *width,
-         gint               *height)
+         int                *x_offset,
+         int                *y_offset,
+         int                *width,
+         int                *height)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
   GtkCellRendererTextPrivate *priv = gtk_cell_renderer_text_get_instance_private (celltext);
@@ -1626,7 +1626,7 @@ get_size (GtkCellRenderer    *cell,
       PangoContext *context;
       PangoFontMetrics *metrics;
       PangoFontDescription *font_desc;
-      gint row_height;
+      int row_height;
 
       style_context = gtk_widget_get_style_context (widget);
 
@@ -1702,9 +1702,9 @@ gtk_cell_renderer_text_snapshot (GtkCellRenderer      *cell,
   GtkCellRendererTextPrivate *priv = gtk_cell_renderer_text_get_instance_private (celltext);
   GtkStyleContext *context;
   PangoLayout *layout;
-  gint x_offset = 0;
-  gint y_offset = 0;
-  gint xpad, ypad;
+  int x_offset = 0;
+  int y_offset = 0;
+  int xpad, ypad;
   PangoRectangle rect;
 
   layout = get_layout (celltext, widget, cell_area, flags);
@@ -1864,7 +1864,7 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer      *cell,
  **/
 void
 gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
-                                                  gint                 number_of_rows)
+                                                  int                  number_of_rows)
 {
   GtkCellRendererTextPrivate *priv = gtk_cell_renderer_text_get_instance_private (renderer);
   GtkCellRenderer *cell = GTK_CELL_RENDERER (renderer);
@@ -1874,7 +1874,7 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
 
   if (number_of_rows == -1)
     {
-      gint width, height;
+      int width, height;
 
       gtk_cell_renderer_get_fixed_size (cell, &width, &height);
       gtk_cell_renderer_set_fixed_size (cell, width, -1);
@@ -1889,8 +1889,8 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
 static void
 gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
                                             GtkWidget       *widget,
-                                            gint            *minimum_size,
-                                            gint            *natural_size)
+                                            int             *minimum_size,
+                                            int             *natural_size)
 {
   GtkCellRendererText        *celltext = GTK_CELL_RENDERER_TEXT (cell);
   GtkCellRendererTextPrivate *priv = gtk_cell_renderer_text_get_instance_private (celltext);
@@ -1898,8 +1898,8 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
   PangoContext               *context;
   PangoFontMetrics           *metrics;
   PangoRectangle              rect;
-  gint char_width, text_width, ellipsize_chars, xpad;
-  gint min_width, nat_width;
+  int char_width, text_width, ellipsize_chars, xpad;
+  int min_width, nat_width;
 
   /* "width-chars" Hard-coded minimum width:
    *    - minimum size should be MAX (width-chars, strlen ("..."));
@@ -1955,7 +1955,7 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
 
   if (priv->max_width_chars > 0)
     {
-      gint max_width = xpad * 2 + PANGO_PIXELS (char_width) * priv->max_width_chars;
+      int max_width = xpad * 2 + PANGO_PIXELS (char_width) * priv->max_width_chars;
       
       min_width = MIN (min_width, max_width);
       nat_width = MIN (nat_width, max_width);
@@ -1971,13 +1971,13 @@ gtk_cell_renderer_text_get_preferred_width (GtkCellRenderer *cell,
 static void
 gtk_cell_renderer_text_get_preferred_height_for_width (GtkCellRenderer *cell,
                                                        GtkWidget       *widget,
-                                                       gint             width,
-                                                       gint            *minimum_height,
-                                                       gint            *natural_height)
+                                                       int              width,
+                                                       int             *minimum_height,
+                                                       int             *natural_height)
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
   PangoLayout         *layout;
-  gint                 text_height, xpad, ypad;
+  int                  text_height, xpad, ypad;
 
   gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
 
@@ -1998,10 +1998,10 @@ gtk_cell_renderer_text_get_preferred_height_for_width (GtkCellRenderer *cell,
 static void
 gtk_cell_renderer_text_get_preferred_height (GtkCellRenderer *cell,
                                              GtkWidget       *widget,
-                                             gint            *minimum_size,
-                                             gint            *natural_size)
+                                             int             *minimum_size,
+                                             int             *natural_size)
 {
-  gint min_width;
+  int min_width;
 
   /* Thankfully cell renderers dont rotate, so they only have to do
    * height-for-width and not the opposite. Here we have only to return
@@ -2024,8 +2024,8 @@ gtk_cell_renderer_text_get_aligned_area (GtkCellRenderer       *cell,
 {
   GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (cell);
   PangoLayout *layout;
-  gint x_offset = 0;
-  gint y_offset = 0;
+  int x_offset = 0;
+  int y_offset = 0;
 
   layout = get_layout (celltext, widget, cell_area, flags);
   get_size (cell, widget, cell_area, layout, &x_offset, &y_offset, 
index 6ee7a97f3d753197dd17c8531682dc3bbd849e6a..d1198aeeb0707cb4a9c71f1d178973e2e61ae1a5 100644 (file)
@@ -64,7 +64,7 @@ GtkCellRenderer *gtk_cell_renderer_text_new      (void);
 
 GDK_AVAILABLE_IN_ALL
 void             gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer,
-                                                                   gint                 number_of_rows);
+                                                                   int                  number_of_rows);
 
 
 G_END_DECLS
index 19e84adc634a4c4bf344b5220aac9aadf06f2c01..2b580e487124d24afb0b08ff021fcf426e5f7352 100644 (file)
@@ -56,10 +56,10 @@ static void gtk_cell_renderer_toggle_set_property  (GObject                    *
 static void gtk_cell_renderer_toggle_get_size   (GtkCellRenderer            *cell,
                                                 GtkWidget                  *widget,
                                                 const GdkRectangle         *cell_area,
-                                                gint                       *x_offset,
-                                                gint                       *y_offset,
-                                                gint                       *width,
-                                                gint                       *height);
+                                                int                        *x_offset,
+                                                int                        *y_offset,
+                                                int                        *width,
+                                                int                        *height);
 static void gtk_cell_renderer_toggle_snapshot   (GtkCellRenderer            *cell,
                                                 GtkSnapshot                *snapshot,
                                                 GtkWidget                  *widget,
@@ -352,14 +352,14 @@ static void
 gtk_cell_renderer_toggle_get_size (GtkCellRenderer    *cell,
                                   GtkWidget          *widget,
                                   const GdkRectangle *cell_area,
-                                  gint               *x_offset,
-                                  gint               *y_offset,
-                                  gint               *width,
-                                  gint               *height)
+                                  int                *x_offset,
+                                  int                *y_offset,
+                                  int                *width,
+                                  int                *height)
 {
-  gint calc_width;
-  gint calc_height;
-  gint xpad, ypad;
+  int calc_width;
+  int calc_height;
+  int xpad, ypad;
   GtkStyleContext *context;
   GtkBorder border, padding;
 
@@ -417,9 +417,9 @@ gtk_cell_renderer_toggle_snapshot (GtkCellRenderer      *cell,
   GtkCellRendererToggle *celltoggle = GTK_CELL_RENDERER_TOGGLE (cell);
   GtkCellRendererTogglePrivate *priv = gtk_cell_renderer_toggle_get_instance_private (celltoggle);
   GtkStyleContext *context;
-  gint width, height;
-  gint x_offset, y_offset;
-  gint xpad, ypad;
+  int width, height;
+  int x_offset, y_offset;
+  int xpad, ypad;
   GtkStateFlags state;
   GtkBorder padding, border;
 
@@ -478,7 +478,7 @@ gtk_cell_renderer_toggle_snapshot (GtkCellRenderer      *cell,
   gtk_snapshot_pop (snapshot);
 }
 
-static gint
+static int
 gtk_cell_renderer_toggle_activate (GtkCellRenderer      *cell,
                                   GdkEvent             *event,
                                   GtkWidget            *widget,
index a7b5a9c3a95e271fc57e28931d8f754149bc795b..d072ef6f13eb3d5363476d7f380912923f8b3a39 100644 (file)
@@ -492,7 +492,7 @@ gtk_cell_view_size_allocate (GtkWidget *widget,
 {
   GtkCellView *cellview = GTK_CELL_VIEW (widget);
   GtkCellViewPrivate *priv = gtk_cell_view_get_instance_private (cellview);
-  gint alloc_width, alloc_height;
+  int alloc_width, alloc_height;
 
   gtk_cell_area_context_get_allocation (priv->context, &alloc_width, &alloc_height);
 
@@ -515,9 +515,9 @@ static void
 gtk_cell_view_request_model (GtkCellView        *cellview,
                             GtkTreeIter        *parent,
                             GtkOrientation      orientation,
-                            gint                for_size,
-                            gint               *minimum_size,
-                            gint               *natural_size)
+                            int                 for_size,
+                            int                *minimum_size,
+                            int                *natural_size)
 {
   GtkCellViewPrivate *priv = gtk_cell_view_get_instance_private (cellview);
   GtkTreeIter         iter;
@@ -529,7 +529,7 @@ gtk_cell_view_request_model (GtkCellView        *cellview,
   valid = gtk_tree_model_iter_children (priv->model, &iter, parent);
   while (valid)
     {
-      gint min, nat;
+      int min, nat;
 
       gtk_cell_area_apply_attributes (priv->area, priv->model, &iter, FALSE, FALSE);
 
@@ -589,7 +589,7 @@ gtk_cell_view_measure (GtkWidget      *widget,
     {
       if (priv->fit_model)
         {
-          gint min = 0, nat = 0;
+          int min = 0, nat = 0;
           gtk_cell_view_request_model (cellview, NULL, GTK_ORIENTATION_HORIZONTAL, -1, &min, &nat);
         }
       else
@@ -606,7 +606,7 @@ gtk_cell_view_measure (GtkWidget      *widget,
     {
       if (priv->fit_model)
         {
-          gint min = 0, nat = 0;
+          int min = 0, nat = 0;
           gtk_cell_view_request_model (cellview, NULL, GTK_ORIENTATION_VERTICAL, -1, &min, &nat);
         }
       else
@@ -623,7 +623,7 @@ gtk_cell_view_measure (GtkWidget      *widget,
     {
       if (priv->fit_model)
         {
-          gint min = 0, nat = 0;
+          int min = 0, nat = 0;
           gtk_cell_view_request_model (cellview, NULL, GTK_ORIENTATION_HORIZONTAL, for_size, &min, &nat);
 
           *minimum = min;
@@ -642,7 +642,7 @@ gtk_cell_view_measure (GtkWidget      *widget,
    {
       if (priv->fit_model)
         {
-          gint min = 0, nat = 0;
+          int min = 0, nat = 0;
           gtk_cell_view_request_model (cellview, NULL, GTK_ORIENTATION_VERTICAL, for_size, &min, &nat);
 
           *minimum = min;
index 2058a449512ffcc21a452a85e51acf920d66e527..28f6de6f7e16d9e828eaf163b7972af88f499e30 100644 (file)
@@ -364,7 +364,7 @@ dialog_destroy (GtkWidget *widget,
 
 static void
 dialog_response (GtkDialog *dialog,
-                 gint       response,
+                 int        response,
                  gpointer   data)
 {
   if (response == GTK_RESPONSE_CANCEL)
@@ -640,8 +640,8 @@ gtk_color_button_get_property (GObject    *object,
 static void
 gtk_color_button_add_palette (GtkColorChooser *chooser,
                               GtkOrientation   orientation,
-                              gint             colors_per_line,
-                              gint             n_colors,
+                              int              colors_per_line,
+                              int              n_colors,
                               GdkRGBA         *colors)
 {
   GtkColorButton *button = GTK_COLOR_BUTTON (chooser);
index 070f7fa20e1a162a7fd44b5be7dc52afc22d0157..1f217c78b4c68b93ed09eb27ab224642b02d3749 100644 (file)
@@ -214,8 +214,8 @@ gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
 void
 gtk_color_chooser_add_palette (GtkColorChooser *chooser,
                                GtkOrientation   orientation,
-                               gint             colors_per_line,
-                               gint             n_colors,
+                               int              colors_per_line,
+                               int              n_colors,
                                GdkRGBA         *colors)
 {
   g_return_if_fail (GTK_IS_COLOR_CHOOSER (chooser));
index fc9531784a2278a75985c6fec089b056131c3841..0ed0872a082e5f7166de3f44a4b2ef857c8418e6 100644 (file)
@@ -47,8 +47,8 @@ struct _GtkColorChooserInterface
 
   void (* add_palette) (GtkColorChooser *chooser,
                         GtkOrientation   orientation,
-                        gint             colors_per_line,
-                        gint             n_colors,
+                        int              colors_per_line,
+                        int              n_colors,
                         GdkRGBA         *colors);
 
   /* Signals */
@@ -78,8 +78,8 @@ void     gtk_color_chooser_set_use_alpha  (GtkColorChooser *chooser,
 GDK_AVAILABLE_IN_ALL
 void     gtk_color_chooser_add_palette    (GtkColorChooser *chooser,
                                            GtkOrientation   orientation,
-                                           gint             colors_per_line,
-                                           gint             n_colors,
+                                           int              colors_per_line,
+                                           int              n_colors,
                                            GdkRGBA         *colors);
 
 G_END_DECLS
index 7e748400b7d2cd835da7db2d0cb1d3f40936084f..5dd68c653227b33146a4b41361007c68a383bc83 100644 (file)
@@ -98,7 +98,7 @@ color_activated_cb (GtkColorChooser *chooser,
 
 static void
 gtk_color_chooser_dialog_response (GtkDialog *dialog,
-                                   gint       response_id,
+                                   int        response_id,
                                    gpointer   user_data)
 {
   if (response_id == GTK_RESPONSE_OK)
@@ -249,8 +249,8 @@ gtk_color_chooser_dialog_set_rgba (GtkColorChooser *chooser,
 static void
 gtk_color_chooser_dialog_add_palette (GtkColorChooser *chooser,
                                       GtkOrientation   orientation,
-                                      gint             colors_per_line,
-                                      gint             n_colors,
+                                      int              colors_per_line,
+                                      int              n_colors,
                                       GdkRGBA         *colors)
 {
   GtkColorChooserDialog *cc = GTK_COLOR_CHOOSER_DIALOG (chooser);
index 938af7632e3ebf01a4e73f748cbc56ad94ebd9ca..12c2aa85aab10323aae8dd9811af0c9663411fb0 100644 (file)
@@ -319,17 +319,17 @@ remove_palette (GtkColorChooserWidget *cc)
 static void
 add_palette (GtkColorChooserWidget  *cc,
              GtkOrientation          orientation,
-             gint                    colors_per_line,
-             gint                    n_colors,
+             int                     colors_per_line,
+             int                     n_colors,
              GdkRGBA                *colors,
              const gchar           **names)
 {
   GtkWidget *grid;
   GtkWidget *p;
   AtkObject *atk_obj;
-  gint line, pos;
-  gint i;
-  gint left, right;
+  int line, pos;
+  int i;
+  int left, right;
 
   if (colors == NULL)
     {
@@ -474,7 +474,7 @@ add_default_palette (GtkColorChooserWidget *cc)
     NC_("Color name", "White")
   };
   GdkRGBA colors[9*3];
-  gint i, j;
+  int i, j;
 
   for (i = 0; i < 9; i++)
     for (j = 0; j < 3; j++)
@@ -537,7 +537,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
   GtkWidget *p;
   GtkWidget *button;
   GtkWidget *label;
-  gint i;
+  int i;
   double color[4];
   GdkRGBA rgba;
   GVariant *variant;
@@ -856,8 +856,8 @@ gtk_color_chooser_widget_set_rgba (GtkColorChooser *chooser,
 static void
 gtk_color_chooser_widget_add_palette (GtkColorChooser *chooser,
                                       GtkOrientation   orientation,
-                                      gint             colors_per_line,
-                                      gint             n_colors,
+                                      int              colors_per_line,
+                                      int              n_colors,
                                       GdkRGBA         *colors)
 {
   GtkColorChooserWidget *cc = GTK_COLOR_CHOOSER_WIDGET (chooser);
index b9a285d823721c3338414c6b2d6157474981349c..f170fb4a73c4903c7ba314765cc5949ba965ed81 100644 (file)
@@ -70,7 +70,7 @@ struct _GtkColorEditor
   GtkWidget *picker_button;
   GtkColorPicker *picker;
 
-  gint popup_position;
+  int popup_position;
 
   guint text_changed : 1;
   guint use_alpha    : 1;
@@ -204,8 +204,8 @@ popup_edit (GtkWidget  *widget,
   GtkWidget *popup = NULL;
   GtkRoot *root;
   GtkWidget *focus;
-  gint position;
-  gint s, e;
+  int position;
+  int s, e;
   const char *param;
 
   param = g_variant_get_string (parameters, NULL);
@@ -273,7 +273,7 @@ get_child_position (GtkOverlay     *overlay,
 {
   GtkRequisition req;
   GtkAllocation alloc;
-  gint s, e;
+  int s, e;
   double x, y;
 
   gtk_widget_get_preferred_size (widget, &req, NULL);
index 8d18aed3f9d721fb3d459a75434508b9d053bf04..90ad66347d485a6d5e8c214096578bf71f63e1ac 100644 (file)
@@ -53,11 +53,11 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkColorPlane, gtk_color_plane, GTK_TYPE_WIDGET)
 
 static void
 sv_to_xy (GtkColorPlane *plane,
-          gint          *x,
-          gint          *y)
+          int           *x,
+          int           *y)
 {
   gdouble s, v;
-  gint width, height;
+  int width, height;
 
   width = gtk_widget_get_width (GTK_WIDGET (plane));
   height = gtk_widget_get_height (GTK_WIDGET (plane));
@@ -74,8 +74,8 @@ plane_snapshot (GtkWidget   *widget,
                 GtkSnapshot *snapshot)
 {
   GtkColorPlane *plane = GTK_COLOR_PLANE (widget);
-  gint x, y;
-  gint width, height;
+  int x, y;
+  int width, height;
 
   sv_to_xy (plane, &x, &y);
   width = gtk_widget_get_width (widget);
@@ -119,13 +119,13 @@ create_texture (GtkColorPlane *plane)
 {
   GtkWidget *widget = GTK_WIDGET (plane);
   GBytes *bytes;
-  gint width, height, stride;
+  int width, height, stride;
   guint red, green, blue;
   guint32 *data, *p;
   float h, s, v;
   float r, g, b;
   gdouble sf, vf;
-  gint x, y;
+  int x, y;
 
   if (!gtk_widget_get_realized (widget))
     return;
@@ -230,8 +230,8 @@ sv_changed (GtkColorPlane *plane)
 
 static void
 update_color (GtkColorPlane *plane,
-              gint           x,
-              gint           y)
+              int            x,
+              int            y)
 {
   GtkWidget *widget = GTK_WIDGET (plane);
   gdouble s, v;
index 8f7354ab7d1bbfac0765c88bab19f62e2e1156c0..496a96a3ce5219442e1462da4db0fd6b9a7ed06e 100644 (file)
@@ -84,7 +84,7 @@ gtk_color_scale_snapshot_trough (GtkColorScale  *scale,
       if (!priv->hue_texture)
         {
           GdkTexture *texture;
-          gint stride;
+          int stride;
           GBytes *bytes;
           guchar *data, *p;
           gdouble h;
index 462f8dd29c4104a357c7a4716ad3b42ea8c091bf..6926bad8b7d9f061802ef2bdf64d2a0d70e7ce5f 100644 (file)
@@ -280,7 +280,7 @@ hold_action (GtkGestureLongPress *gesture,
 
 static void
 tap_action (GtkGestureClick *gesture,
-            gint             n_press,
+            int              n_press,
             gdouble          x,
             gdouble          y,
             GtkColorSwatch  *swatch)
@@ -331,7 +331,7 @@ gtk_color_swatch_measure (GtkWidget *widget,
                           int            *natural_baseline)
 {
   GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
-  gint w, h, min;
+  int w, h, min;
 
   gtk_widget_measure (swatch->overlay_widget,
                       orientation,
index 5ab02aa0a386a02057a247c3e1eea903cc275154..046d48e1cace6c9d12740b305d7714555578b61f 100644 (file)
@@ -116,7 +116,7 @@ typedef struct
 
   GtkCellArea *area;
 
-  gint active; /* Only temporary */
+  int active; /* Only temporary */
   GtkTreeRowReference *active_row;
 
   GtkWidget *cell_view;
@@ -134,10 +134,10 @@ typedef struct
   /* For "has-entry" specific behavior we track
    * an automated cell renderer and text column
    */
-  gint  text_column;
+  int   text_column;
   GtkCellRenderer *text_renderer;
 
-  gint id_column;
+  int id_column;
 
   guint popup_in_progress : 1;
   guint popup_shown : 1;
@@ -250,7 +250,7 @@ static void     gtk_combo_box_model_row_deleted    (GtkTreeModel     *model,
 static void     gtk_combo_box_model_rows_reordered (GtkTreeModel     *model,
                                                     GtkTreePath      *path,
                                                     GtkTreeIter      *iter,
-                                                    gint             *new_order,
+                                                    int              *new_order,
                                                     gpointer          user_data);
 static void     gtk_combo_box_model_row_changed    (GtkTreeModel     *model,
                                                     GtkTreePath      *path,
@@ -354,7 +354,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
-  gint menu_width;
+  int menu_width;
 
   gtk_widget_size_allocate (priv->box,
                             &(GtkAllocation) {
@@ -1231,7 +1231,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
 #if 0
-  gint active_item;
+  int active_item;
   GtkWidget *active;
   int width, min_width, nat_width;
 #endif
@@ -1286,7 +1286,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box)
     }
   else
     {
-      gint rect_anchor_dy = -2;
+      int rect_anchor_dy = -2;
       GList *i;
       GtkWidget *child;
 
@@ -1309,7 +1309,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box)
 
       if (active)
         {
-          gint child_height;
+          int child_height;
           GList *children;
           children = gtk_menu_shell_get_items (GTK_MENU_SHELL (priv->popup_widget));
           for (i = children; i && i->data != active; i = i->next)
@@ -1769,7 +1769,7 @@ static void
 gtk_combo_box_model_rows_reordered (GtkTreeModel    *model,
                                     GtkTreePath     *path,
                                     GtkTreeIter     *iter,
-                                    gint            *new_order,
+                                    int             *new_order,
                                     gpointer         user_data)
 {
   gtk_tree_row_reference_reordered (G_OBJECT (user_data), path, iter, new_order);
@@ -1901,11 +1901,11 @@ gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model)
  * Returns: An integer which is the index of the currently active item,
  *     or -1 if there’s no active item.
  */
-gint
+int
 gtk_combo_box_get_active (GtkComboBox *combo_box)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
-  gint result;
+  int result;
 
   g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), 0);
 
@@ -1933,7 +1933,7 @@ gtk_combo_box_get_active (GtkComboBox *combo_box)
  */
 void
 gtk_combo_box_set_active (GtkComboBox *combo_box,
-                          gint         index_)
+                          int          index_)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
   GtkTreePath *path = NULL;
@@ -1964,7 +1964,7 @@ gtk_combo_box_set_active_internal (GtkComboBox *combo_box,
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
   GtkTreePath *active_path;
-  gint path_cmp;
+  int path_cmp;
 
   /* Remember whether the initially active row is valid. */
   gboolean is_valid_row_reference = gtk_tree_row_reference_valid (priv->active_row);
@@ -2690,7 +2690,7 @@ gtk_combo_box_get_has_entry (GtkComboBox *combo_box)
  */
 void
 gtk_combo_box_set_entry_text_column (GtkComboBox *combo_box,
-                                     gint         text_column)
+                                     int          text_column)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
 
@@ -2721,7 +2721,7 @@ gtk_combo_box_set_entry_text_column (GtkComboBox *combo_box,
  *
  * Returns: A column in the data source model of @combo_box.
  */
-gint
+int
 gtk_combo_box_get_entry_text_column (GtkComboBox *combo_box)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
@@ -2797,7 +2797,7 @@ gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable,
  */
 void
 gtk_combo_box_set_id_column (GtkComboBox *combo_box,
-                             gint         id_column)
+                             int          id_column)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
 
@@ -2824,7 +2824,7 @@ gtk_combo_box_set_id_column (GtkComboBox *combo_box,
  *
  * Returns: A column in the data source model of @combo_box.
  */
-gint
+int
 gtk_combo_box_get_id_column (GtkComboBox *combo_box)
 {
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
@@ -2858,7 +2858,7 @@ gtk_combo_box_get_active_id (GtkComboBox *combo_box)
   GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box);
   GtkTreeModel *model;
   GtkTreeIter iter;
-  gint column;
+  int column;
 
   g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
 
@@ -2910,7 +2910,7 @@ gtk_combo_box_set_active_id (GtkComboBox *combo_box,
   GtkTreeModel *model;
   GtkTreeIter iter;
   gboolean match = FALSE;
-  gint column;
+  int column;
 
   g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), FALSE);
 
index afcfbbd5ea7e0913f4c399adc280c03463bb61d8..7247672b4bcc5821871b6affc5c520ab3f9f8f9d 100644 (file)
@@ -81,10 +81,10 @@ GtkWidget    *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model);
 
 /* get/set active item */
 GDK_AVAILABLE_IN_ALL
-gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);
+int           gtk_combo_box_get_active       (GtkComboBox     *combo_box);
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_active       (GtkComboBox     *combo_box,
-                                              gint             index_);
+                                              int              index_);
 GDK_AVAILABLE_IN_ALL
 gboolean      gtk_combo_box_get_active_iter  (GtkComboBox     *combo_box,
                                               GtkTreeIter     *iter);
@@ -117,9 +117,9 @@ GDK_AVAILABLE_IN_ALL
 gboolean           gtk_combo_box_get_has_entry          (GtkComboBox        *combo_box);
 GDK_AVAILABLE_IN_ALL
 void               gtk_combo_box_set_entry_text_column  (GtkComboBox        *combo_box,
-                                                         gint                text_column);
+                                                         int                 text_column);
 GDK_AVAILABLE_IN_ALL
-gint               gtk_combo_box_get_entry_text_column  (GtkComboBox        *combo_box);
+int                gtk_combo_box_get_entry_text_column  (GtkComboBox        *combo_box);
 
 GDK_AVAILABLE_IN_ALL
 void               gtk_combo_box_set_popup_fixed_width  (GtkComboBox      *combo_box,
@@ -139,10 +139,10 @@ GDK_AVAILABLE_IN_ALL
 AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
 
 GDK_AVAILABLE_IN_ALL
-gint          gtk_combo_box_get_id_column        (GtkComboBox *combo_box);
+int           gtk_combo_box_get_id_column        (GtkComboBox *combo_box);
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_set_id_column        (GtkComboBox *combo_box,
-                                                  gint         id_column);
+                                                  int          id_column);
 GDK_AVAILABLE_IN_ALL
 const gchar * gtk_combo_box_get_active_id        (GtkComboBox *combo_box);
 GDK_AVAILABLE_IN_ALL
index 9305562c6472ff8f6caf0be579a657ab4f2cb07b..0578f8336dc987733637147129de640d1525d02f 100644 (file)
@@ -124,7 +124,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkComboBoxText, gtk_combo_box_text, GTK_TYPE_COMBO_BOX
 static void
 gtk_combo_box_text_constructed (GObject *object)
 {
-  const gint text_column = 0;
+  const int text_column = 0;
 
   G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructed (object);
 
@@ -423,7 +423,7 @@ gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box,
  */
 void
 gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box,
-                                gint             position,
+                                int              position,
                                 const gchar     *text)
 {
   gtk_combo_box_text_insert (combo_box, position, NULL, text);
@@ -485,13 +485,13 @@ gtk_combo_box_text_prepend (GtkComboBoxText *combo_box,
  */
 void
 gtk_combo_box_text_insert (GtkComboBoxText *combo_box,
-                           gint             position,
+                           int              position,
                            const gchar     *id,
                            const gchar     *text)
 {
   GtkListStore *store;
   GtkTreeIter iter;
-  gint text_column;
+  int text_column;
 
   g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (combo_box));
   g_return_if_fail (text != NULL);
@@ -517,7 +517,7 @@ gtk_combo_box_text_insert (GtkComboBoxText *combo_box,
 
   if (id != NULL)
     {
-      gint id_column;
+      int id_column;
 
       id_column = gtk_combo_box_get_id_column (GTK_COMBO_BOX (combo_box));
       g_return_if_fail (id_column >= 0);
@@ -536,7 +536,7 @@ gtk_combo_box_text_insert (GtkComboBoxText *combo_box,
  */
 void
 gtk_combo_box_text_remove (GtkComboBoxText *combo_box,
-                           gint             position)
+                           int              position)
 {
   GtkTreeModel *model;
   GtkListStore *store;
@@ -600,7 +600,7 @@ gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box)
   else if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter))
     {
       GtkTreeModel *model;
-      gint text_column;
+      int text_column;
 
       model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box));
       g_return_val_if_fail (GTK_IS_LIST_STORE (model), NULL);
index 80feb5ab4f909194bf947b3f4fb43309e8e67630..e25478404ac9b83aebead02b4de4635b31e37542 100644 (file)
@@ -44,14 +44,14 @@ void          gtk_combo_box_text_append_text     (GtkComboBoxText     *combo_box
                                                   const gchar         *text);
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_insert_text     (GtkComboBoxText     *combo_box,
-                                                  gint                 position,
+                                                  int                  position,
                                                   const gchar         *text);
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_prepend_text    (GtkComboBoxText     *combo_box,
                                                   const gchar         *text);
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_remove          (GtkComboBoxText     *combo_box,
-                                                  gint                 position);
+                                                  int                  position);
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_remove_all      (GtkComboBoxText     *combo_box);
 GDK_AVAILABLE_IN_ALL
@@ -59,7 +59,7 @@ gchar        *gtk_combo_box_text_get_active_text (GtkComboBoxText     *combo_box
 
 GDK_AVAILABLE_IN_ALL
 void          gtk_combo_box_text_insert          (GtkComboBoxText     *combo_box,
-                                                  gint                 position,
+                                                  int                  position,
                                                   const gchar         *id,
                                                   const gchar         *text);
 GDK_AVAILABLE_IN_ALL
index c355c6a7bdae1034dbb7d9184a07b745a4b5ae35..4ae96c2350a181acc8b05de086f16eefeceeb608 100644 (file)
@@ -415,7 +415,7 @@ gtk_compose_list_format_for_gtk (GList *compose_list,
   return compose_list;
 }
 
-static gint
+static int
 gtk_compose_data_compare (gpointer a,
                           gpointer b,
                           gpointer data)
@@ -595,7 +595,7 @@ gtk_compose_table_serialize (GtkComposeTable *compose_table,
   return contents;
 }
 
-static gint
+static int
 gtk_compose_table_find (gconstpointer data1,
                         gconstpointer data2)
 {
@@ -830,8 +830,8 @@ gtk_compose_table_new_with_file (const gchar *compose_file)
 GSList *
 gtk_compose_table_list_add_array (GSList        *compose_tables,
                                   const guint16 *data,
-                                  gint           max_seq_len,
-                                  gint           n_seqs)
+                                  int            max_seq_len,
+                                  int            n_seqs)
 {
   guint32 hash;
   GtkComposeTable *compose_table;
index f2e8e8de3d1b51fb7b3ca1117bb414531cbb577f..b29a22718a1028a72ff34ad53335bbe7c950a439 100644 (file)
@@ -29,24 +29,24 @@ typedef struct _GtkComposeTableCompact GtkComposeTableCompact;
 struct _GtkComposeTable
 {
   guint16 *data;
-  gint max_seq_len;
-  gint n_seqs;
+  int max_seq_len;
+  int n_seqs;
   guint32 id;
 };
 
 struct _GtkComposeTableCompact
 {
   const guint16 *data;
-  gint max_seq_len;
-  gint n_index_size;
-  gint n_index_stride;
+  int max_seq_len;
+  int n_index_size;
+  int n_index_stride;
 };
 
 GtkComposeTable * gtk_compose_table_new_with_file (const gchar   *compose_file);
 GSList *gtk_compose_table_list_add_array          (GSList        *compose_tables,
                                                    const guint16 *data,
-                                                   gint           max_seq_len,
-                                                   gint           n_seqs);
+                                                   int            max_seq_len,
+                                                   int            n_seqs);
 GSList *gtk_compose_table_list_add_file           (GSList        *compose_tables,
                                                    const gchar   *compose_file);
 
index 076abd950abb8be46c9fc069765dc90f6e7080fa..1d0c474d2cbbb50459075c1f74486b7020782471 100644 (file)
@@ -50,7 +50,7 @@ static double
 gtk_css_animation_get_progress (GtkCssAnimation *animation)
 {
   gboolean reverse, odd_iteration;
-  gint cycle = gtk_progress_tracker_get_iteration_cycle (&animation->tracker);
+  int cycle = gtk_progress_tracker_get_iteration_cycle (&animation->tracker);
   odd_iteration = cycle % 2 > 0;
 
   switch (animation->direction)
index 03a8a67d52f6b18ff482c589ec9d972b24173bca..2fa93d25401604e63d310642deaee053b5b85097 100644 (file)
@@ -46,7 +46,7 @@ gtk_css_image_icon_theme_snapshot (GtkCssImage *image,
   GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
   GtkIconPaintable *icon;
   double icon_width, icon_height;
-  gint size;
+  int size;
   double x, y;
 
   size = floor (MIN (width, height));
index 23cbb16bbe2e07b993bd2d08e73112aad8aad595..d640f8aaa9bc3f7363c6283721ebd0609e5166a1 100644 (file)
@@ -130,7 +130,7 @@ static GtkCssImage *
 gtk_css_image_recolor_load (GtkCssImageRecolor  *recolor,
                             GtkCssStyle         *style,
                             GtkCssValue         *palette,
-                            gint                 scale,
+                            int                  scale,
                             GError             **gerror)
 {
   GError *local_error = NULL;
index 266411435f40098544eb31169876319ffc17485c..ae78cf74ce9d10ccd1927cb4f59aa3efaf571e9c 100644 (file)
@@ -180,7 +180,7 @@ find_class (const GtkCssNodeDeclaration *decl,
             GQuark                       class_quark,
             guint                       *position)
 {
-  gint min, max, mid;
+  int min, max, mid;
   gboolean found = FALSE;
   guint pos;
 
index 51b752261257ee96c887c2462895dafd0db812bb..cd384ff1dae8f5fb0365ceff8dcf89d5b81bd3f9 100644 (file)
@@ -516,7 +516,7 @@ static void
 gtk_css_calc_array_add (GPtrArray *array, GtkCssValue *value)
 {
   gsize i;
-  gint calc_term_order;
+  int calc_term_order;
 
   calc_term_order = gtk_css_number_value_get_calc_term_order (value);
 
index 04b3a1d152d464e416fbdaab5c2afdc01640f5a2..54e899bb89f94e15d6674cd95583d6ba8f6ec417 100644 (file)
@@ -1237,7 +1237,7 @@ _gtk_css_find_theme_dir (const gchar *dir,
   gchar *file;
   gchar *base;
   gchar *subsubdir;
-  gint i;
+  int i;
   gchar *path;
 
   if (variant)
index 7c7c0f87409910f22c748ad9d09c6b50bab14a0b..b8ef92a9ae32187018e3a2d5f58cd77fd7eb3497 100644 (file)
@@ -982,7 +982,7 @@ string_has_number (const char *string,
 static gboolean
 parse_plus_b (GtkCssParser *parser,
               gboolean      negate,
-              gint         *b)
+              int          *b)
 {
   const GtkCssToken *token;
   gboolean has_seen_sign;
@@ -1039,9 +1039,9 @@ parse_plus_b (GtkCssParser *parser,
 
 static gboolean
 parse_n_plus_b (GtkCssParser *parser,
-                gint          before,
-                gint         *a,
-                gint         *b)
+                int           before,
+                int          *a,
+                int          *b)
 {
   const GtkCssToken *token;
 
@@ -1080,9 +1080,9 @@ parse_n_plus_b (GtkCssParser *parser,
                 
 static gboolean
 parse_a_n_plus_b (GtkCssParser *parser,
-                  gint          seen_sign,
-                  gint         *a,
-                  gint         *b)
+                  int           seen_sign,
+                  int          *a,
+                  int          *b)
 {
   const GtkCssToken *token;
 
@@ -1197,7 +1197,7 @@ parse_a_n_plus_b_arg (GtkCssParser *parser,
                       guint         arg,
                       gpointer      data)
 {
-  gint *ab = data;
+  int *ab = data;
 
   if (!parse_a_n_plus_b (parser, FALSE, &ab[0], &ab[1]))
     return 0;
@@ -1327,7 +1327,7 @@ gtk_css_selector_parse_selector_pseudo_class (GtkCssParser   *parser,
     {
       if (gtk_css_token_is_function (token, "nth-child"))
         {
-          gint ab[2];
+          int ab[2];
 
           if (!gtk_css_parser_consume_function (parser, 1, 1, parse_a_n_plus_b_arg, ab))
             {
@@ -1345,7 +1345,7 @@ gtk_css_selector_parse_selector_pseudo_class (GtkCssParser   *parser,
         }
       else if (gtk_css_token_is_function (token, "nth-last-child"))
         {
-          gint ab[2];
+          int ab[2];
 
           if (!gtk_css_parser_consume_function (parser, 1, 1, parse_a_n_plus_b_arg, ab))
             {
index 8a15649b74161c26ef9f59b9c8151a53efd4784a..106a90ea5ad8ad64d233413511a11d31dc11470e 100644 (file)
@@ -428,7 +428,7 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
   GtkTextDecorationStyle decoration_style;
   const GdkRGBA *color;
   const GdkRGBA *decoration_color;
-  gint letter_spacing;
+  int letter_spacing;
   GtkCssFontVariantLigature ligatures;
   GtkCssFontVariantNumeric numeric;
   GtkCssFontVariantEastAsian east_asian;
index d09b366c00f6daa46f475b7683428012f4f8e73a..7a6a312fd32fd43b69e6df527affe8a94839e807 100644 (file)
@@ -37,7 +37,7 @@ typedef struct _GtkCssValueClass      GtkCssValueClass;
 /* using define instead of struct here so compilers get the packing right */
 #define GTK_CSS_VALUE_BASE \
   const GtkCssValueClass *class; \
-  gint ref_count; \
+  int ref_count; \
   guint is_computed: 1;
 
 struct _GtkCssValueClass {
index 75e471689ca1a07981069255fb5b35402d853dab..988cdac8cbd935c9e97a241138d60a3428832ade 100644 (file)
@@ -245,7 +245,7 @@ gtk_print_save_custom_papers (GListStore *store)
   GKeyFile *keyfile;
   gchar *filename, *data, *parentdir;
   gsize len;
-  gint i = 0;
+  int i = 0;
 
   keyfile = g_key_file_new ();
 
@@ -618,7 +618,7 @@ add_custom_paper (GtkCustomPaperUnixDialog *dialog)
   GtkPageSetup *page_setup;
   GtkPaperSize *paper_size;
   gchar *name;
-  gint i;
+  int i;
 
   i = 1;
   name = NULL;
index 84b8e4550341b2bfc8e30ba2c0c3d4d96ef1ec10..44d7c2dfe1f6c09cc5a62a2b2f1ec701c4cf42e2 100644 (file)
@@ -169,7 +169,7 @@ typedef struct
   GtkWidget *action_box;
   GtkSizeGroup *size_group;
 
-  gint use_header_bar;
+  int use_header_bar;
   gboolean constructed;
   ResponseData *action_widgets;
 } GtkDialogPrivate;
@@ -179,7 +179,7 @@ struct _ResponseData
   ResponseData *next;
   GtkDialog *dialog;
   GtkWidget *widget;
-  gint response_id;
+  int response_id;
 };
 
 static void      gtk_dialog_add_buttons_valist   (GtkDialog    *dialog,
@@ -233,7 +233,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkDialog, gtk_dialog, GTK_TYPE_WINDOW,
 
 static void
 set_use_header_bar (GtkDialog *dialog,
-                    gint       use_header_bar)
+                    int        use_header_bar)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
 
@@ -300,7 +300,7 @@ gtk_dialog_get_property (GObject      *object,
 static void
 action_widget_activated (GtkWidget *widget, GtkDialog *dialog)
 {
-  gint response_id;
+  int response_id;
 
   response_id = gtk_dialog_get_response_for_widget (dialog, widget);
 
@@ -310,7 +310,7 @@ action_widget_activated (GtkWidget *widget, GtkDialog *dialog)
 static void
 add_response_data (GtkDialog *dialog,
                    GtkWidget *child,
-                   gint       response_id)
+                   int        response_id)
 {
   ResponseData *ad;
   guint signal_id;
@@ -338,7 +338,7 @@ add_response_data (GtkDialog *dialog,
 static void
 add_to_header_bar (GtkDialog *dialog,
                    GtkWidget *child,
-                   gint       response_id)
+                   int        response_id)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
 
@@ -358,7 +358,7 @@ add_to_header_bar (GtkDialog *dialog,
 static void
 apply_response_for_action_area (GtkDialog *dialog,
                                 GtkWidget *child,
-                                gint       response_id)
+                                int        response_id)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
 
@@ -368,7 +368,7 @@ apply_response_for_action_area (GtkDialog *dialog,
 static void
 add_to_action_area (GtkDialog *dialog,
                     GtkWidget *child,
-                    gint       response_id)
+                    int        response_id)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
 
@@ -419,7 +419,7 @@ gtk_dialog_constructed (GObject *object)
         {
           gboolean has_default;
           ResponseData *rd;
-          gint response_id;
+          int response_id;
 
           child = l->data;
 
@@ -832,7 +832,7 @@ get_response_data (GtkDialog *dialog,
 void
 gtk_dialog_add_action_widget (GtkDialog *dialog,
                               GtkWidget *child,
-                              gint       response_id)
+                              int        response_id)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
 
@@ -872,7 +872,7 @@ gtk_dialog_add_action_widget (GtkDialog *dialog,
 GtkWidget*
 gtk_dialog_add_button (GtkDialog   *dialog,
                        const gchar *button_text,
-                       gint         response_id)
+                       int          response_id)
 {
   GtkWidget *button;
 
@@ -893,7 +893,7 @@ gtk_dialog_add_buttons_valist (GtkDialog      *dialog,
                                va_list         args)
 {
   const gchar* text;
-  gint response_id;
+  int response_id;
 
   g_return_if_fail (GTK_IS_DIALOG (dialog));
 
@@ -901,7 +901,7 @@ gtk_dialog_add_buttons_valist (GtkDialog      *dialog,
     return;
 
   text = first_button_text;
-  response_id = va_arg (args, gint);
+  response_id = va_arg (args, int);
 
   while (text != NULL)
     {
@@ -953,7 +953,7 @@ gtk_dialog_add_buttons (GtkDialog   *dialog,
  **/
 void
 gtk_dialog_set_response_sensitive (GtkDialog *dialog,
-                                   gint       response_id,
+                                   int        response_id,
                                    gboolean   setting)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
@@ -979,7 +979,7 @@ gtk_dialog_set_response_sensitive (GtkDialog *dialog,
  **/
 void
 gtk_dialog_set_default_response (GtkDialog *dialog,
-                                 gint       response_id)
+                                 int        response_id)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
   ResponseData *rd;
@@ -1007,7 +1007,7 @@ gtk_dialog_set_default_response (GtkDialog *dialog,
  **/
 void
 gtk_dialog_response (GtkDialog *dialog,
-                     gint       response_id)
+                     int        response_id)
 {
   g_return_if_fail (GTK_IS_DIALOG (dialog));
 
@@ -1030,7 +1030,7 @@ gtk_dialog_response (GtkDialog *dialog,
  */
 GtkWidget*
 gtk_dialog_get_widget_for_response (GtkDialog *dialog,
-                                    gint       response_id)
+                                    int        response_id)
 {
   GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog);
   ResponseData *rd;
@@ -1057,7 +1057,7 @@ gtk_dialog_get_widget_for_response (GtkDialog *dialog,
  * Returns: the response id of @widget, or %GTK_RESPONSE_NONE
  *  if @widget doesn’t have a response id set.
  */
-gint
+int
 gtk_dialog_get_response_for_widget (GtkDialog *dialog,
                                    GtkWidget *widget)
 {
@@ -1072,23 +1072,23 @@ gtk_dialog_get_response_for_widget (GtkDialog *dialog,
 
 typedef struct {
   gchar *widget_name;
-  gint response_id;
+  int response_id;
   gboolean is_default;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } ActionWidgetInfo;
 
 typedef struct {
   GtkDialog *dialog;
   GtkBuilder *builder;
   GSList *items;
-  gint response_id;
+  int response_id;
   gboolean is_default;
   gboolean is_text;
   GString *string;
   gboolean in_action_widgets;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } SubParserData;
 
 static void
index b6530176615d4b4cfe289f26515a7f05cc6c98de..e5ffc1a90e10a1a3bf0ab928cdf1265b42a5b6ae 100644 (file)
@@ -120,7 +120,7 @@ struct _GtkDialogClass
 
   /*< public >*/
 
-  void (* response) (GtkDialog *dialog, gint response_id);
+  void (* response) (GtkDialog *dialog, int response_id);
 
   /* Keybinding signals */
 
@@ -147,11 +147,11 @@ GtkWidget* gtk_dialog_new_with_buttons (const gchar     *title,
 GDK_AVAILABLE_IN_ALL
 void       gtk_dialog_add_action_widget (GtkDialog   *dialog,
                                          GtkWidget   *child,
-                                         gint         response_id);
+                                         int          response_id);
 GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_dialog_add_button        (GtkDialog   *dialog,
                                          const gchar *button_text,
-                                         gint         response_id);
+                                         int          response_id);
 GDK_AVAILABLE_IN_ALL
 void       gtk_dialog_add_buttons       (GtkDialog   *dialog,
                                          const gchar *first_button_text,
@@ -159,22 +159,22 @@ void       gtk_dialog_add_buttons       (GtkDialog   *dialog,
 
 GDK_AVAILABLE_IN_ALL
 void gtk_dialog_set_response_sensitive (GtkDialog *dialog,
-                                        gint       response_id,
+                                        int        response_id,
                                         gboolean   setting);
 GDK_AVAILABLE_IN_ALL
 void gtk_dialog_set_default_response   (GtkDialog *dialog,
-                                        gint       response_id);
+                                        int        response_id);
 GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_dialog_get_widget_for_response (GtkDialog *dialog,
-                                               gint       response_id);
+                                               int        response_id);
 GDK_AVAILABLE_IN_ALL
-gint gtk_dialog_get_response_for_widget (GtkDialog *dialog,
+int gtk_dialog_get_response_for_widget (GtkDialog *dialog,
                                          GtkWidget *widget);
 
 /* Emit response signal */
 GDK_AVAILABLE_IN_ALL
 void gtk_dialog_response           (GtkDialog *dialog,
-                                    gint       response_id);
+                                    int        response_id);
 
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_dialog_get_content_area (GtkDialog *dialog);
index cffd44cf5d056c2e5e82e55945c5f3e2d4e08984..73787607f4b50ea9d01d349d828044dfc8b94728 100644 (file)
@@ -736,7 +736,7 @@ gtk_drag_check_threshold (GtkWidget *widget,
                           int        current_x,
                           int        current_y)
 {
-  gint drag_threshold;
+  int drag_threshold;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
 
index 77d42411215ca55506f2c25bb72c05eb13737bd7..dbf69b834a8d2b77e516e17fb96506e942a9f6ce 100644 (file)
@@ -288,8 +288,8 @@ static void   gtk_entry_size_allocate        (GtkWidget        *widget,
 static void   gtk_entry_snapshot             (GtkWidget        *widget,
                                               GtkSnapshot      *snapshot);
 static gboolean gtk_entry_query_tooltip      (GtkWidget        *widget,
-                                              gint              x,
-                                              gint              y,
+                                              int               x,
+                                              int               y,
                                               gboolean          keyboard_tip,
                                               GtkTooltip       *tooltip);
 static void   gtk_entry_direction_changed    (GtkWidget        *widget,
@@ -1407,7 +1407,7 @@ gtk_entry_finalize (GObject *object)
   GtkEntry *entry = GTK_ENTRY (object);
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
   EntryIconInfo *icon_info = NULL;
-  gint i;
+  int i;
 
   for (i = 0; i < MAX_ICONS; i++)
     {
@@ -1503,7 +1503,7 @@ get_icon_position_from_controller (GtkEntry           *entry,
 
 static void
 icon_pressed_cb (GtkGestureClick *gesture,
-                 gint                  n_press,
+                 int                   n_press,
                  gdouble               x,
                  gdouble               y,
                  GtkEntry             *entry)
@@ -1523,7 +1523,7 @@ icon_pressed_cb (GtkGestureClick *gesture,
 
 static void
 icon_released_cb (GtkGestureClick *gesture,
-                  gint             n_press,
+                  int              n_press,
                   gdouble          x,
                   gdouble          y,
                   GtkEntry        *entry)
@@ -1682,7 +1682,7 @@ gtk_entry_size_allocate (GtkWidget *widget,
   const gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
-  gint i;
+  int i;
   GtkAllocation text_alloc;
 
   text_alloc.x = 0;
@@ -2193,7 +2193,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  **/
 void
 gtk_entry_set_max_length (GtkEntry     *entry,
-                          gint          max)
+                          int           max)
 {
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
 
@@ -2215,7 +2215,7 @@ gtk_entry_set_max_length (GtkEntry     *entry,
  * Returns: the maximum allowed number of characters
  *               in #GtkEntry, or 0 if there is no maximum.
  **/
-gint
+int
 gtk_entry_get_max_length (GtkEntry *entry)
 {
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
@@ -2784,10 +2784,10 @@ gtk_entry_get_icon_storage_type (GtkEntry             *entry,
  *
  * Returns: the index of the icon at the given position, or -1
  */
-gint
+int
 gtk_entry_get_icon_at_pos (GtkEntry *entry,
-                           gint      x,
-                           gint      y)
+                           int       x,
+                           int       y)
 {
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
   guint i;
@@ -2865,12 +2865,12 @@ gtk_entry_set_icon_drag_source (GtkEntry             *entry,
  * Returns: index of the icon which is the source of the current
  *          DND operation, or -1.
  */
-gint
+int
 gtk_entry_get_current_icon_drag_source (GtkEntry *entry)
 {
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
   EntryIconInfo *icon_info = NULL;
-  gint i;
+  int i;
 
   g_return_val_if_fail (GTK_IS_ENTRY (entry), -1);
 
@@ -3123,15 +3123,15 @@ gtk_entry_set_icon_tooltip_markup (GtkEntry             *entry,
 
 static gboolean
 gtk_entry_query_tooltip (GtkWidget  *widget,
-                         gint        x,
-                         gint        y,
+                         int         x,
+                         int         y,
                          gboolean    keyboard_tip,
                          GtkTooltip *tooltip)
 {
   GtkEntry *entry = GTK_ENTRY (widget);
   GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry);
   EntryIconInfo *icon_info;
-  gint icon_pos;
+  int icon_pos;
 
   if (!keyboard_tip)
     {
index 06ae90d818dff86855e421c0ebbd5b2dae83ac50..4f5b529a18f21c5f8ed7f4ce381a5ad62f63d828 100644 (file)
@@ -139,9 +139,9 @@ gboolean   gtk_entry_get_overwrite_mode         (GtkEntry      *entry);
 /* text is truncated if needed */
 GDK_AVAILABLE_IN_ALL
 void       gtk_entry_set_max_length            (GtkEntry      *entry,
-                                                gint           max);
+                                                int            max);
 GDK_AVAILABLE_IN_ALL
-gint       gtk_entry_get_max_length             (GtkEntry      *entry);
+int        gtk_entry_get_max_length             (GtkEntry      *entry);
 GDK_AVAILABLE_IN_ALL
 guint16    gtk_entry_get_text_length            (GtkEntry      *entry);
 
@@ -225,9 +225,9 @@ GDK_AVAILABLE_IN_ALL
 gboolean     gtk_entry_get_icon_sensitive                (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos);
 GDK_AVAILABLE_IN_ALL
-gint         gtk_entry_get_icon_at_pos                   (GtkEntry             *entry,
-                                                         gint                  x,
-                                                         gint                  y);
+int          gtk_entry_get_icon_at_pos                   (GtkEntry             *entry,
+                                                         int                   x,
+                                                         int                   y);
 GDK_AVAILABLE_IN_ALL
 void         gtk_entry_set_icon_tooltip_text             (GtkEntry             *entry,
                                                          GtkEntryIconPosition  icon_pos,
@@ -248,7 +248,7 @@ void         gtk_entry_set_icon_drag_source              (GtkEntry             *
                                                          GdkContentProvider   *provider,
                                                          GdkDragAction         actions);
 GDK_AVAILABLE_IN_ALL
-gint         gtk_entry_get_current_icon_drag_source      (GtkEntry             *entry);
+int          gtk_entry_get_current_icon_drag_source      (GtkEntry             *entry);
 GDK_AVAILABLE_IN_ALL
 void         gtk_entry_get_icon_area                     (GtkEntry             *entry,
                                                           GtkEntryIconPosition  icon_pos,
index de365ff6a5d2d7847aa2c10dbc45361a3ae3420c..00158e3a0ca5f88a22393b7a4672305d9045a583 100644 (file)
@@ -75,7 +75,7 @@ struct _GtkEntryBufferPrivate
   gsize  normal_text_bytes;
   guint  normal_text_chars;
 
-  gint   max_length;
+  int    max_length;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkEntryBuffer, gtk_entry_buffer, G_TYPE_OBJECT)
@@ -437,7 +437,7 @@ gtk_entry_buffer_class_init (GtkEntryBufferClass *klass)
  **/
 GtkEntryBuffer*
 gtk_entry_buffer_new (const gchar *initial_chars,
-                      gint         n_initial_chars)
+                      int          n_initial_chars)
 {
   GtkEntryBuffer *buffer = g_object_new (GTK_TYPE_ENTRY_BUFFER, NULL);
   if (initial_chars)
@@ -533,7 +533,7 @@ gtk_entry_buffer_get_text (GtkEntryBuffer *buffer)
 void
 gtk_entry_buffer_set_text (GtkEntryBuffer *buffer,
                            const gchar    *chars,
-                           gint            n_chars)
+                           int             n_chars)
 {
   g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
   g_return_if_fail (chars != NULL);
@@ -557,7 +557,7 @@ gtk_entry_buffer_set_text (GtkEntryBuffer *buffer,
  **/
 void
 gtk_entry_buffer_set_max_length (GtkEntryBuffer *buffer,
-                                 gint            max_length)
+                                 int             max_length)
 {
   GtkEntryBufferPrivate *priv = gtk_entry_buffer_get_instance_private (buffer);
 
@@ -585,7 +585,7 @@ gtk_entry_buffer_set_max_length (GtkEntryBuffer *buffer,
  * Returns: the maximum allowed number of characters
  *               in #GtkEntryBuffer, or 0 if there is no maximum.
  */
-gint
+int
 gtk_entry_buffer_get_max_length (GtkEntryBuffer *buffer)
 {
   GtkEntryBufferPrivate *priv = gtk_entry_buffer_get_instance_private (buffer);
@@ -618,7 +618,7 @@ guint
 gtk_entry_buffer_insert_text (GtkEntryBuffer *buffer,
                               guint           position,
                               const gchar    *chars,
-                              gint            n_chars)
+                              int             n_chars)
 {
   GtkEntryBufferPrivate *pv = gtk_entry_buffer_get_instance_private (buffer);
   GtkEntryBufferClass *klass;
@@ -673,7 +673,7 @@ gtk_entry_buffer_insert_text (GtkEntryBuffer *buffer,
 guint
 gtk_entry_buffer_delete_text (GtkEntryBuffer *buffer,
                               guint           position,
-                              gint            n_chars)
+                              int             n_chars)
 {
   GtkEntryBufferClass *klass;
   guint length;
index ce270d18a870b3bc2f60196380fe09a03ce3d601..8c7a91b9841e3ee1ad95cded680bcb0cff9f8f20 100644 (file)
@@ -92,7 +92,7 @@ GType                     gtk_entry_buffer_get_type               (void) G_GNUC_
 
 GDK_AVAILABLE_IN_ALL
 GtkEntryBuffer*           gtk_entry_buffer_new                    (const gchar     *initial_chars,
-                                                                   gint             n_initial_chars);
+                                                                   int              n_initial_chars);
 
 GDK_AVAILABLE_IN_ALL
 gsize                     gtk_entry_buffer_get_bytes              (GtkEntryBuffer  *buffer);
@@ -106,25 +106,25 @@ const gchar*              gtk_entry_buffer_get_text               (GtkEntryBuffe
 GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_set_text               (GtkEntryBuffer  *buffer,
                                                                    const gchar     *chars,
-                                                                   gint             n_chars);
+                                                                   int              n_chars);
 
 GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_set_max_length         (GtkEntryBuffer  *buffer,
-                                                                   gint             max_length);
+                                                                   int              max_length);
 
 GDK_AVAILABLE_IN_ALL
-gint                      gtk_entry_buffer_get_max_length         (GtkEntryBuffer  *buffer);
+int                       gtk_entry_buffer_get_max_length         (GtkEntryBuffer  *buffer);
 
 GDK_AVAILABLE_IN_ALL
 guint                     gtk_entry_buffer_insert_text            (GtkEntryBuffer  *buffer,
                                                                    guint            position,
                                                                    const gchar     *chars,
-                                                                   gint             n_chars);
+                                                                   int              n_chars);
 
 GDK_AVAILABLE_IN_ALL
 guint                     gtk_entry_buffer_delete_text            (GtkEntryBuffer  *buffer,
                                                                    guint            position,
-                                                                   gint             n_chars);
+                                                                   int              n_chars);
 
 GDK_AVAILABLE_IN_ALL
 void                      gtk_entry_buffer_emit_inserted_text     (GtkEntryBuffer  *buffer,
index 09a43778b2f21120249d4c8d89f65ffa91bc5a08..81d492c51056b965d375737fe943d351298d5848 100644 (file)
@@ -973,7 +973,7 @@ gtk_entry_completion_set_match_func (GtkEntryCompletion          *completion,
  */
 void
 gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion *completion,
-                                             gint                length)
+                                             int                 length)
 {
   g_return_if_fail (GTK_IS_ENTRY_COMPLETION (completion));
   g_return_if_fail (length >= 0);
@@ -995,7 +995,7 @@ gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion *completion,
  *
  * Returns: The currently used minimum key length
  */
-gint
+int
 gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion *completion)
 {
   g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), 0);
@@ -1056,7 +1056,7 @@ gtk_entry_completion_complete (GtkEntryCompletion *completion)
  */
 void
 gtk_entry_completion_set_text_column (GtkEntryCompletion *completion,
-                                      gint                column)
+                                      int                 column)
 {
   GtkCellRenderer *cell;
 
@@ -1086,7 +1086,7 @@ gtk_entry_completion_set_text_column (GtkEntryCompletion *completion,
  *
  * Returns: the column containing the strings
  */
-gint
+int
 gtk_entry_completion_get_text_column (GtkEntryCompletion *completion)
 {
   g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), -1);
@@ -1101,12 +1101,12 @@ void
 _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
 {
   GtkAllocation allocation;
-  gint matches, items, height;
+  int matches, items, height;
   GdkSurface *surface;
   GtkRequisition entry_req;
   GtkRequisition tree_req;
   GtkTreePath *path;
-  gint width;
+  int width;
 
   surface = gtk_native_get_surface (gtk_widget_get_native (completion->entry));
 
@@ -1303,8 +1303,8 @@ gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
 {
   if (prefix)
     {
-      gint key_len;
-      gint prefix_len;
+      int key_len;
+      int prefix_len;
       const gchar *key;
 
       prefix_len = g_utf8_strlen (prefix, -1);
@@ -1314,7 +1314,7 @@ gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion,
 
       if (prefix_len > key_len)
         {
-          gint pos = prefix_len;
+          int pos = prefix_len;
 
           gtk_editable_insert_text (GTK_EDITABLE (completion->entry),
                                     prefix + strlen (key), -1, &pos);
@@ -1349,7 +1349,7 @@ static void
 gtk_entry_completion_insert_completion_text (GtkEntryCompletion *completion,
                                              const gchar        *new_text)
 {
-  gint len;
+  int len;
   GtkText *text = gtk_entry_get_text_widget (GTK_ENTRY (completion->entry));
   GtkEntryBuffer *buffer = gtk_text_get_buffer (text);
 
@@ -1632,7 +1632,7 @@ gtk_entry_completion_get_inline_selection (GtkEntryCompletion *completion)
 }
 
 
-static gint
+static int
 gtk_entry_completion_timeout (gpointer data)
 {
   GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (data);
@@ -1643,7 +1643,7 @@ gtk_entry_completion_timeout (gpointer data)
       g_utf8_strlen (gtk_editable_get_text (GTK_EDITABLE (completion->entry)), -1)
       >= completion->minimum_key_length)
     {
-      gint matches;
+      int matches;
       gboolean popup_single;
 
       gtk_entry_completion_complete (completion);
@@ -1691,7 +1691,7 @@ gtk_entry_completion_key_pressed (GtkEventControllerKey *controller,
                                   GdkModifierType        state,
                                   gpointer               user_data)
 {
-  gint matches;
+  int matches;
   GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (user_data);
   GtkWidget *widget = completion->entry;
   GtkText *text = gtk_entry_get_text_widget (GTK_ENTRY (widget));
index 6fd623edd9e9fe08f800231c86663c700b2f2961..4d98c8347ea5ebd1a1eda929c5d5e2bfa52194e3 100644 (file)
@@ -83,9 +83,9 @@ void                gtk_entry_completion_set_match_func         (GtkEntryComplet
                                                                  GDestroyNotify               func_notify);
 GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_minimum_key_length (GtkEntryCompletion          *completion,
-                                                                 gint                         length);
+                                                                 int                          length);
 GDK_AVAILABLE_IN_ALL
-gint                gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion          *completion);
+int                 gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion          *completion);
 GDK_AVAILABLE_IN_ALL
 gchar *             gtk_entry_completion_compute_prefix         (GtkEntryCompletion          *completion,
                                                                  const char                  *key);
@@ -125,9 +125,9 @@ const gchar         *gtk_entry_completion_get_completion_prefix (GtkEntryComplet
 /* convenience */
 GDK_AVAILABLE_IN_ALL
 void                gtk_entry_completion_set_text_column        (GtkEntryCompletion          *completion,
-                                                                 gint                         column);
+                                                                 int                          column);
 GDK_AVAILABLE_IN_ALL
-gint                gtk_entry_completion_get_text_column        (GtkEntryCompletion          *completion);
+int                 gtk_entry_completion_get_text_column        (GtkEntryCompletion          *completion);
 
 G_END_DECLS
 
index a04b63e288ea2f1ad0cae4630908f16fa0e95c06..eaafce354e7c696e42523af3c6298737b2d76fed 100644 (file)
@@ -47,8 +47,8 @@ struct _GtkEntryCompletion
   gpointer match_data;
   GDestroyNotify match_notify;
 
-  gint minimum_key_length;
-  gint text_column;
+  int minimum_key_length;
+  int text_column;
 
   gchar *case_normalized_key;
 
@@ -63,7 +63,7 @@ struct _GtkEntryCompletion
   gulong changed_id;
   gulong insert_text_id;
 
-  gint current_selected;
+  int current_selected;
 
   guint first_sel_changed : 1;
   guint has_completion    : 1;
@@ -87,7 +87,7 @@ struct _GtkEntryCompletionClass
                                  GtkTreeModel       *model,
                                  GtkTreeIter        *iter);
   void     (* action_activated) (GtkEntryCompletion *completion,
-                                 gint                index_);
+                                 int                 index_);
   gboolean (* insert_prefix)    (GtkEntryCompletion *completion,
                                  const gchar        *prefix);
   gboolean (* cursor_on_match)  (GtkEntryCompletion *completion,
index 2cee4be4b8aadb3408f97e5faed3dc1176394a6f..5f4084a38f6ebaa9d96521c8c85cc5c115471253 100644 (file)
@@ -279,7 +279,7 @@ gtk_event_controller_scroll_handle_event (GtkEventController *controller,
 
       if (scroll->flags & GTK_EVENT_CONTROLLER_SCROLL_DISCRETE)
         {
-          gint steps;
+          int steps;
 
           scroll->cur_dx += dx;
           scroll->cur_dy += dy;
index 0ceff8679bc3be6e88e145e8d41c3ee8a94c353e..b20ea03ce8583225aa8327e5ab9225861447dcfb 100644 (file)
@@ -211,7 +211,7 @@ static void gtk_expander_measure (GtkWidget      *widget,
 
 /* Gestures */
 static void     gesture_click_released_cb (GtkGestureClick *gesture,
-                                           gint             n_press,
+                                           int              n_press,
                                            gdouble          x,
                                            gdouble          y,
                                            GtkExpander     *expander);
@@ -565,7 +565,7 @@ gtk_expander_size_allocate (GtkWidget *widget,
 
 static void
 gesture_click_released_cb (GtkGestureClick *gesture,
-                           gint             n_press,
+                           int              n_press,
                            gdouble          x,
                            gdouble          y,
                            GtkExpander     *expander)
index 39548eccf3849667c9a222fa0672347028c486e2..58f8fd590f2e50c8265970a054cff6ac52a68a5d 100644 (file)
@@ -476,7 +476,7 @@ param_expression_validate (GParamSpec *pspec,
   return changed;
 }
 
-static gint
+static int
 param_expression_values_cmp (GParamSpec   *pspec,
                              const GValue *value1,
                              const GValue *value2)
index 1ffa9807e7b0833031d879be184c4c52ce0258d2..4078a2d720d791ae037d306ce82be4306a62877a 100644 (file)
@@ -279,7 +279,7 @@ static void          set_info_for_file_at_iter         (GtkFileChooserButton *bu
                                                         GFile                *file,
                                                         GtkTreeIter          *iter);
 
-static gint          model_get_type_position      (GtkFileChooserButton *button,
+static int           model_get_type_position      (GtkFileChooserButton *button,
                                                    RowType               row_type);
 static void          model_free_row_data          (GtkFileChooserButton *button,
                                                    GtkTreeIter          *iter);
@@ -292,8 +292,8 @@ static void          model_add_bookmarks          (GtkFileChooserButton *button,
 static void          model_update_current_folder  (GtkFileChooserButton *button,
                                                    GFile                *file);
 static void          model_remove_rows            (GtkFileChooserButton *button,
-                                                   gint                  pos,
-                                                   gint                  n_rows);
+                                                   int                   pos,
+                                                   int                   n_rows);
 
 static gboolean      filter_model_visible_func    (GtkTreeModel         *model,
                                                    GtkTreeIter          *iter,
@@ -321,10 +321,10 @@ static void     button_clicked_cb                (GtkButton      *real_button,
                                                   gpointer        user_data);
 
 static void     dialog_response_cb               (GtkDialog      *dialog,
-                                                  gint            response,
+                                                  int             response,
                                                   gpointer        user_data);
 static void     native_response_cb               (GtkFileChooserNative *native,
-                                                  gint            response,
+                                                  int             response,
                                                   gpointer        user_data);
 static void     volumes_changed                  (GVolumeMonitor *volume_monitor,
                                                   gpointer        volume,
@@ -793,7 +793,7 @@ gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser  *chooser,
     {
       GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (chooser);
       GtkTreeIter iter;
-      gint pos;
+      int pos;
 
       pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
       pos += button->n_shortcuts;
@@ -832,7 +832,7 @@ gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser  *chooser,
     {
       GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (chooser);
       GtkTreeIter iter;
-      gint pos;
+      int pos;
       gchar type;
 
       pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
@@ -1240,7 +1240,7 @@ change_icon_theme_get_info_cb (GObject      *source,
   icon = _gtk_file_info_get_icon (info, ICON_SIZE, gtk_widget_get_scale_factor (GTK_WIDGET (data->button)));
   if (icon)
     {
-      gint width = 0;
+      int width = 0;
       GtkTreeIter iter;
       GtkTreePath *path;
 
@@ -1276,7 +1276,7 @@ static void
 change_icon_theme (GtkFileChooserButton *button)
 {
   GtkTreeIter iter;
-  gint width = 0;
+  int width = 0;
 
   g_slist_free_full (button->change_icon_theme_cancellables, (GDestroyNotify)g_cancellable_cancel);
   button->change_icon_theme_cancellables = NULL;
@@ -1490,11 +1490,11 @@ set_info_for_file_at_iter (GtkFileChooserButton *button,
 }
 
 /* Shortcuts Model */
-static gint
+static int
 model_get_type_position (GtkFileChooserButton *button,
                          RowType               row_type)
 {
-  gint retval = 0;
+  int retval = 0;
 
   if (row_type == ROW_TYPE_SPECIAL)
     return retval;
@@ -1649,7 +1649,7 @@ model_add_special (GtkFileChooserButton *button)
   GtkListStore *store;
   GtkTreeIter iter;
   GFile *file;
-  gint pos;
+  int pos;
 
   store = GTK_LIST_STORE (button->model);
   pos = model_get_type_position (button, ROW_TYPE_SPECIAL);
@@ -1743,7 +1743,7 @@ model_add_volumes (GtkFileChooserButton *button,
                    GSList               *volumes)
 {
   GtkListStore *store;
-  gint pos;
+  int pos;
   GSList *l;
 
   if (!volumes)
@@ -1804,7 +1804,7 @@ model_add_bookmarks (GtkFileChooserButton *button,
 {
   GtkListStore *store;
   GtkTreeIter iter;
-  gint pos;
+  int pos;
   GSList *l;
 
   if (!bookmarks)
@@ -1888,7 +1888,7 @@ model_update_current_folder (GtkFileChooserButton *button,
 {
   GtkListStore *store;
   GtkTreeIter iter;
-  gint pos;
+  int pos;
 
   if (!file)
     return;
@@ -1970,7 +1970,7 @@ model_add_other (GtkFileChooserButton *button)
 {
   GtkListStore *store;
   GtkTreeIter iter;
-  gint pos;
+  int pos;
   GIcon *icon;
 
   store = GTK_LIST_STORE (button->model);
@@ -2002,8 +2002,8 @@ model_add_other (GtkFileChooserButton *button)
 
 static void
 model_remove_rows (GtkFileChooserButton *button,
-                   gint                  pos,
-                   gint                  n_rows)
+                   int                   pos,
+                   int                   n_rows)
 {
   GtkListStore *store;
 
@@ -2188,7 +2188,7 @@ update_combo_box (GtkFileChooserButton *button)
 
   if (!row_found)
     {
-      gint pos;
+      int pos;
 
       /* If it hasn't been found already, update & select the current-folder row. */
       if (file)
@@ -2716,7 +2716,7 @@ button_clicked_cb (GtkButton *real_button,
 
 static void
 common_response_cb (GtkFileChooserButton *button,
-                    gint       response)
+                    int        response)
 {
   if (response == GTK_RESPONSE_ACCEPT ||
       response == GTK_RESPONSE_OK)
@@ -2740,7 +2740,7 @@ common_response_cb (GtkFileChooserButton *button,
 
 static void
 dialog_response_cb (GtkDialog *dialog,
-                    gint       response,
+                    int        response,
                     gpointer   user_data)
 {
   GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
@@ -2756,7 +2756,7 @@ dialog_response_cb (GtkDialog *dialog,
 
 static void
 native_response_cb (GtkFileChooserNative *native,
-                    gint       response,
+                    int        response,
                     gpointer   user_data)
 {
   GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
@@ -2872,7 +2872,7 @@ gtk_file_chooser_button_get_title (GtkFileChooserButton *button)
  *
  * Returns: an integer width (in characters) that the button will use to size itself.
  */
-gint
+int
 gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button)
 {
   g_return_val_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button), -1);
@@ -2889,7 +2889,7 @@ gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button)
  */
 void
 gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button,
-                                         gint                  n_chars)
+                                         int                   n_chars)
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button));
 
index b17ca5956af38939b1ba482697d970d8151888be..ecd3bbd5be7e382f448363f61111666e96c958af 100644 (file)
@@ -47,10 +47,10 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_file_chooser_button_set_title        (GtkFileChooserButton *button,
                                                                const gchar          *title);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
+int                   gtk_file_chooser_button_get_width_chars  (GtkFileChooserButton *button);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_file_chooser_button_set_width_chars  (GtkFileChooserButton *button,
-                                                               gint                  n_chars);
+                                                               int                   n_chars);
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_file_chooser_button_get_modal        (GtkFileChooserButton *button);
 GDK_AVAILABLE_IN_ALL
index f7a16057cc53d213f59eab6091e370e529a89423..e77d8a6b0d82b1c0a51c1fe75d5bfca7f8fd20e8 100644 (file)
@@ -268,7 +268,7 @@ static void     gtk_file_chooser_dialog_activate_response (GtkWidget        *wid
                                                            GVariant         *parameters);
 
 static void response_cb (GtkDialog *dialog,
-                         gint       response_id);
+                         int        response_id);
 
 static void setup_save_entry (GtkFileChooserDialog *dialog);
 
@@ -327,13 +327,13 @@ static GtkWidget *
 get_accept_action_widget (GtkDialog *dialog,
                           gboolean   sensitive_only)
 {
-  gint response[] = {
+  int response[] = {
     GTK_RESPONSE_ACCEPT,
     GTK_RESPONSE_OK,
     GTK_RESPONSE_YES,
     GTK_RESPONSE_APPLY
   };
-  gint i;
+  int i;
   GtkWidget *widget;
 
   for (i = 0; i < G_N_ELEMENTS (response); i++)
@@ -353,7 +353,7 @@ get_accept_action_widget (GtkDialog *dialog,
 }
 
 static gboolean
-is_accept_response_id (gint response_id)
+is_accept_response_id (int response_id)
 {
   return (response_id == GTK_RESPONSE_ACCEPT ||
           response_id == GTK_RESPONSE_OK ||
@@ -588,7 +588,7 @@ gtk_file_chooser_dialog_realize (GtkWidget *widget)
 {
   GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget);
   GSettings *settings;
-  gint width, height;
+  int width, height;
 
   settings = _gtk_file_chooser_get_settings_for_widget (widget);
   g_settings_get (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", &width, &height);
@@ -666,7 +666,7 @@ gtk_file_chooser_dialog_size_allocate (GtkWidget *widget,
  */
 static void
 response_cb (GtkDialog *dialog,
-             gint       response_id)
+             int        response_id)
 {
   GtkFileChooserDialogPrivate *priv = gtk_file_chooser_dialog_get_instance_private (GTK_FILE_CHOOSER_DIALOG (dialog));
 
@@ -690,7 +690,7 @@ gtk_file_chooser_dialog_new_valist (const gchar          *title,
 {
   GtkWidget *result;
   const char *button_text = first_button_text;
-  gint response_id;
+  int response_id;
 
   result = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
                          "title", title,
@@ -702,7 +702,7 @@ gtk_file_chooser_dialog_new_valist (const gchar          *title,
 
   while (button_text)
     {
-      response_id = va_arg (varargs, gint);
+      response_id = va_arg (varargs, int);
       gtk_dialog_add_button (GTK_DIALOG (result), button_text, response_id);
       button_text = va_arg (varargs, const gchar *);
     }
index 97e36f099409a8a1b7f5ffacd68685244ef02e0e..b399b9688844db9d68008ce8faad1ac00a4ffcf8 100644 (file)
@@ -92,14 +92,14 @@ static gboolean gtk_file_chooser_entry_tab_handler    (GtkEventControllerKey *ke
                                                        GtkFileChooserEntry   *chooser_entry);
 
 #ifdef G_OS_WIN32
-static gint     insert_text_callback      (GtkFileChooserEntry *widget,
+static int      insert_text_callback      (GtkFileChooserEntry *widget,
                                           const gchar         *new_text,
-                                          gint                 new_text_length,
-                                          gint                *position,
+                                          int                  new_text_length,
+                                          int                 *position,
                                           gpointer             user_data);
 static void     delete_text_callback      (GtkFileChooserEntry *widget,
-                                          gint                 start_pos,
-                                          gint                 end_pos,
+                                          int                  start_pos,
+                                          int                  end_pos,
                                           gpointer             user_data);
 #endif
 
@@ -315,7 +315,7 @@ match_selected_callback (GtkEntryCompletion  *completion,
                          GtkFileChooserEntry *chooser_entry)
 {
   char *path;
-  gint pos;
+  int pos;
 
   gtk_tree_model_get (model, iter,
                       FULL_PATH_COLUMN, &path,
@@ -480,7 +480,7 @@ gtk_file_chooser_entry_tab_handler (GtkEventControllerKey *key,
                                     GtkFileChooserEntry   *chooser_entry)
 {
   GtkEditable *editable = GTK_EDITABLE (chooser_entry);
-  gint start, end;
+  int start, end;
 
   if (keyval == GDK_KEY_Escape &&
       chooser_entry->eat_escape)
@@ -730,15 +730,15 @@ refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry)
 }
 
 #ifdef G_OS_WIN32
-static gint
+static int
 insert_text_callback (GtkFileChooserEntry *chooser_entry,
                      const gchar         *new_text,
-                     gint                 new_text_length,
-                     gint                *position,
+                     int                  new_text_length,
+                     int                 *position,
                      gpointer             user_data)
 {
   const gchar *colon = memchr (new_text, ':', new_text_length);
-  gint i;
+  int i;
 
   /* Disallow these characters altogether */
   for (i = 0; i < new_text_length; i++)
@@ -773,8 +773,8 @@ insert_text_callback (GtkFileChooserEntry *chooser_entry,
 
 static void
 delete_text_callback (GtkFileChooserEntry *chooser_entry,
-                     gint                 start_pos,
-                     gint                 end_pos,
+                     int                  start_pos,
+                     int                  end_pos,
                      gpointer             user_data)
 {
   /* If deleting a drive letter, delete the colon, too */
@@ -1006,7 +1006,7 @@ _gtk_file_chooser_entry_select_filename (GtkFileChooserEntry *chooser_entry)
        len = g_utf8_pointer_to_offset (str, ext);
     }
 
-  gtk_editable_select_region (GTK_EDITABLE (chooser_entry), 0, (gint) len);
+  gtk_editable_select_region (GTK_EDITABLE (chooser_entry), 0, (int) len);
 }
 
 void
index 6755eb90d7eeeba9ea33948de2f2a668d8198b28..8f9e98b9a7928c29ea9fb65b2bb4c8578c9c9830 100644 (file)
@@ -548,7 +548,7 @@ gtk_file_chooser_native_new (const gchar          *title,
 
 static void
 dialog_response_cb (GtkDialog *dialog,
-                    gint response_id,
+                    int response_id,
                     gpointer data)
 {
   GtkFileChooserNative *self = data;
index 847a461536c73cc6a1391d54b4a5d23781a5af0a..fe24b2dcac01e12404ef9c950224305234933a88 100644 (file)
@@ -125,7 +125,7 @@ chooser_get_files (FileChooserQuartzData *data)
   if (!data->save)
     {
       NSArray *urls;
-      gint i;
+      int i;
 
       urls = [(NSOpenPanel *)data->panel URLs];
 
index 7bb3e54b3640fd063d459614e32cee9795cb4583..bd1ebb6c5b844caeb2b73c9a1c8eff9f3c8e3689 100644 (file)
@@ -350,7 +350,7 @@ filechooser_win32_thread_done (gpointer _data)
   for (l = self->choices; l; l = l->next)
     {
       GtkFileChooserNativeChoice *choice = (GtkFileChooserNativeChoice*) l->data;
-      gint sel = g_array_index (data->choices_selections, gint,
+      int sel = g_array_index (data->choices_selections, int,
                                 g_slist_position (self->choices, l));
 
       if (sel >= 0)
@@ -755,7 +755,7 @@ filechooser_win32_thread (gpointer _data)
 
       if (data->choices_selections)
         g_array_free (data->choices_selections, TRUE);
-      data->choices_selections = g_array_sized_new (FALSE, FALSE, sizeof(gint),
+      data->choices_selections = g_array_sized_new (FALSE, FALSE, sizeof(int),
                                                     g_slist_length (data->self->choices));
 
       hr = IFileDialog_QueryInterface (pfd, &IID_IFileDialogCustomize, (LPVOID *) &pfdc);
@@ -767,7 +767,7 @@ filechooser_win32_thread (gpointer _data)
             {
               GtkFileChooserNativeChoice *choice = (GtkFileChooserNativeChoice*) l->data;
               DWORD dialog_item_id = (DWORD) g_slist_position (data->self->choices, l);
-              gint val = -1;
+              int val = -1;
 
               if (choice->options)
                 {
@@ -777,7 +777,7 @@ filechooser_win32_thread (gpointer _data)
                                                                     dialog_item_id,
                                                                     &dialog_sub_item_id);
                   if (SUCCEEDED (hr))
-                    val = (gint) dialog_sub_item_id;
+                    val = (int) dialog_sub_item_id;
                 }
               else
                 {
index 4c9360571e1055303c4942019bf4f25fc66b808f..a70938cf470ecbf7ecc26457b47ca03369af771e 100644 (file)
@@ -288,7 +288,7 @@ struct _GtkFileChooserWidget
   GtkWidget *toplevel_current_focus_widget;
   GtkWidget *toplevel_last_focus_widget;
 
-  gint sort_column;
+  int sort_column;
   GtkSortType sort_order;
 
   ClockFormat clock_format;
@@ -464,7 +464,7 @@ static void down_folder_handler     (GtkFileChooserWidget *impl);
 static void home_folder_handler     (GtkFileChooserWidget *impl);
 static void desktop_folder_handler  (GtkFileChooserWidget *impl);
 static void quick_bookmark_handler  (GtkFileChooserWidget *impl,
-                                     gint                   bookmark_index);
+                                     int                    bookmark_index);
 static void show_hidden_handler     (GtkFileChooserWidget *impl);
 static void search_shortcut_handler (GtkFileChooserWidget *impl);
 static void recent_shortcut_handler (GtkFileChooserWidget *impl);
@@ -532,7 +532,7 @@ static void     recent_clear_model           (GtkFileChooserWidget *impl,
                                               gboolean               remove_from_treeview);
 static gboolean recent_should_respond        (GtkFileChooserWidget *impl);
 static void     clear_model_cache            (GtkFileChooserWidget *impl,
-                                              gint                  column);
+                                              int                   column);
 static void     set_model_filter             (GtkFileChooserWidget *impl,
                                               GtkFileFilter        *filter);
 static void     switch_to_home_dir           (GtkFileChooserWidget *impl);
@@ -1031,7 +1031,7 @@ selection_check_foreach_cb (GtkTreeModel *model,
 /* Checks whether the selected items in the file list are all files or all folders */
 static void
 selection_check (GtkFileChooserWidget *impl,
-                 gint                  *num_selected,
+                 int                   *num_selected,
                  gboolean              *all_files,
                  gboolean              *all_folders)
 {
@@ -1537,7 +1537,7 @@ change_sort_directories_first_state (GSimpleAction *action,
 
 static void
 clear_model_cache (GtkFileChooserWidget *impl,
-                   gint                  column)
+                   int                   column)
 {
   if (impl->browse_files_model)
     _gtk_file_system_model_clear_cache (impl->browse_files_model, column);
@@ -1703,7 +1703,7 @@ file_list_drag_drop_cb (GtkDropTarget        *dest,
 static void
 check_file_list_popover_sensitivity (GtkFileChooserWidget *impl)
 {
-  gint num_selected;
+  int num_selected;
   gboolean all_files;
   gboolean all_folders;
   gboolean active;
@@ -2071,8 +2071,8 @@ long_press_cb (GtkGesture           *gesture,
 
 typedef struct {
   OperationMode operation_mode;
-  gint general_column;
-  gint model_column;
+  int general_column;
+  int model_column;
 } ColumnMap;
 
 /* Sets the sort column IDs for the file list; needs to be done whenever we
@@ -2093,8 +2093,8 @@ file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
 
 static gboolean
 file_list_query_tooltip_cb (GtkWidget  *widget,
-                            gint        x,
-                            gint        y,
+                            int         x,
+                            int         y,
                             gboolean    keyboard_tip,
                             GtkTooltip *tooltip,
                             gpointer    user_data)
@@ -2142,7 +2142,7 @@ file_list_query_tooltip_cb (GtkWidget  *widget,
 static void
 set_icon_cell_renderer_fixed_size (GtkFileChooserWidget *impl)
 {
-  gint xpad, ypad;
+  int xpad, ypad;
 
   gtk_cell_renderer_get_padding (impl->list_pixbuf_renderer, &xpad, &ypad);
   gtk_cell_renderer_set_fixed_size (impl->list_pixbuf_renderer,
@@ -2154,13 +2154,13 @@ static GtkWidget *
 get_accept_action_widget (GtkDialog *dialog,
                           gboolean   sensitive_only)
 {
-  gint response[] = {
+  int response[] = {
     GTK_RESPONSE_ACCEPT,
     GTK_RESPONSE_OK,
     GTK_RESPONSE_YES,
     GTK_RESPONSE_APPLY
   };
-  gint i;
+  int i;
   GtkWidget *widget;
 
   for (i = 0; i < G_N_ELEMENTS (response); i++)
@@ -3254,10 +3254,10 @@ settings_load (GtkFileChooserWidget *impl)
   gboolean sort_directories_first;
   DateFormat date_format;
   TypeFormat type_format;
-  gint sort_column;
+  int sort_column;
   GtkSortType sort_order;
   StartupMode startup_mode;
-  gint sidebar_width;
+  int sidebar_width;
   GSettings *settings;
 
   settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
@@ -3504,7 +3504,7 @@ gtk_file_chooser_widget_unmap (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_file_chooser_widget_parent_class)->unmap (widget);
 }
 
-static gint
+static int
 compare_directory (GtkFileSystemModel   *model,
                    GtkTreeIter          *a,
                    GtkTreeIter          *b,
@@ -3521,14 +3521,14 @@ compare_directory (GtkFileSystemModel   *model,
   return 0;
 }
 
-static gint
+static int
 compare_name (GtkFileSystemModel   *model,
               GtkTreeIter          *a,
               GtkTreeIter          *b,
               GtkFileChooserWidget *impl)
 {
   const char *key_a, *key_b;
-  gint result;
+  int result;
 
   key_a = g_value_get_string (_gtk_file_system_model_get_value (model, a, MODEL_COL_NAME_COLLATED));
   key_b = g_value_get_string (_gtk_file_system_model_get_value (model, b, MODEL_COL_NAME_COLLATED));
@@ -3545,7 +3545,7 @@ compare_name (GtkFileSystemModel   *model,
   return result;
 }
 
-static gint
+static int
 compare_size (GtkFileSystemModel   *model,
               GtkTreeIter          *a,
               GtkTreeIter          *b,
@@ -3559,7 +3559,7 @@ compare_size (GtkFileSystemModel   *model,
   return size_a < size_b ? -1 : (size_a == size_b ? 0 : 1);
 }
 
-static gint
+static int
 compare_type (GtkFileSystemModel   *model,
               GtkTreeIter          *a,
               GtkTreeIter          *b,
@@ -3573,7 +3573,7 @@ compare_type (GtkFileSystemModel   *model,
   return g_strcmp0 (key_a, key_b);
 }
 
-static gint
+static int
 compare_time (GtkFileSystemModel   *model,
               GtkTreeIter          *a,
               GtkTreeIter          *b,
@@ -3587,7 +3587,7 @@ compare_time (GtkFileSystemModel   *model,
   return ta < tb ? -1 : (ta == tb ? 0 : 1);
 }
 
-static gint
+static int
 compare_location (GtkFileSystemModel   *model,
                   GtkTreeIter          *a,
                   GtkTreeIter          *b,
@@ -3602,7 +3602,7 @@ compare_location (GtkFileSystemModel   *model,
 }
 
 /* Sort callback for the filename column */
-static gint
+static int
 name_sort_func (GtkTreeModel *model,
                 GtkTreeIter  *a,
                 GtkTreeIter  *b,
@@ -3610,7 +3610,7 @@ name_sort_func (GtkTreeModel *model,
 {
   GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
   GtkFileChooserWidget *impl = user_data;
-  gint result;
+  int result;
 
   result = compare_directory (fs_model, a, b, impl);
 
@@ -3621,7 +3621,7 @@ name_sort_func (GtkTreeModel *model,
 }
 
 /* Sort callback for the size column */
-static gint
+static int
 size_sort_func (GtkTreeModel *model,
                 GtkTreeIter  *a,
                 GtkTreeIter  *b,
@@ -3629,7 +3629,7 @@ size_sort_func (GtkTreeModel *model,
 {
   GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
   GtkFileChooserWidget *impl = user_data;
-  gint result;
+  int result;
 
   result = compare_directory (fs_model, a, b, impl);
 
@@ -3640,7 +3640,7 @@ size_sort_func (GtkTreeModel *model,
 }
 
 /* Sort callback for the type column */
-static gint
+static int
 type_sort_func (GtkTreeModel *model,
                 GtkTreeIter  *a,
                 GtkTreeIter  *b,
@@ -3648,7 +3648,7 @@ type_sort_func (GtkTreeModel *model,
 {
   GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
   GtkFileChooserWidget *impl = user_data;
-  gint result;
+  int result;
 
   result = compare_directory (fs_model, a, b, impl);
 
@@ -3659,7 +3659,7 @@ type_sort_func (GtkTreeModel *model,
 }
 
 /* Sort callback for the time column */
-static gint
+static int
 time_sort_func (GtkTreeModel *model,
                 GtkTreeIter  *a,
                 GtkTreeIter  *b,
@@ -3667,7 +3667,7 @@ time_sort_func (GtkTreeModel *model,
 {
   GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
   GtkFileChooserWidget *impl = user_data;
-  gint result;
+  int result;
 
   result = compare_directory (fs_model, a, b, impl);
 
@@ -3677,7 +3677,7 @@ time_sort_func (GtkTreeModel *model,
   return result;
 }
 
-static gint
+static int
 recent_sort_func (GtkTreeModel *model,
                   GtkTreeIter  *a,
                   GtkTreeIter  *b,
@@ -3685,7 +3685,7 @@ recent_sort_func (GtkTreeModel *model,
 {
   GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
   GtkFileChooserWidget *impl = user_data;
-  gint result;
+  int result;
 
   result = compare_time (fs_model, a, b, impl);
 
@@ -3698,7 +3698,7 @@ recent_sort_func (GtkTreeModel *model,
   return result;
 }
 
-static gint
+static int
 search_sort_func (GtkTreeModel *model,
                   GtkTreeIter  *a,
                   GtkTreeIter  *b,
@@ -3706,7 +3706,7 @@ search_sort_func (GtkTreeModel *model,
 {
   GtkFileSystemModel *fs_model = GTK_FILE_SYSTEM_MODEL (model);
   GtkFileChooserWidget *impl = user_data;
-  gint result;
+  int result;
 
   result = compare_location (fs_model, a, b, impl);
 
@@ -3726,7 +3726,7 @@ static void
 list_sort_column_changed_cb (GtkTreeSortable       *sortable,
                              GtkFileChooserWidget *impl)
 {
-  gint sort_column_id;
+  int sort_column_id;
   GtkSortType sort_type;
 
   if (gtk_tree_sortable_get_sort_column_id (sortable, &sort_column_id, &sort_type))
@@ -4173,7 +4173,7 @@ my_g_format_date_for_display (GtkFileChooserWidget *impl,
   GDateTime *now_date, *date;
   const gchar *format;
   gchar *date_str;
-  gint days_ago;
+  int days_ago;
 
   time = g_date_time_new_from_unix_local (secs);
   date = g_date_time_new_local (g_date_time_get_year (time),
@@ -4652,12 +4652,12 @@ struct update_chooser_entry_selected_foreach_closure {
   GtkTreeIter first_selected_iter;
 };
 
-static gint
+static int
 compare_utf8_filenames (const gchar *a,
                         const gchar *b)
 {
   gchar *a_folded, *b_folded;
-  gint retval;
+  int retval;
 
   a_folded = g_utf8_strdown (a, -1);
   b_folded = g_utf8_strdown (b, -1);
@@ -5685,7 +5685,7 @@ get_display_name_from_file_list (GtkFileChooserWidget *impl)
 static void
 add_custom_button_to_dialog (GtkDialog   *dialog,
                              const gchar *mnemonic_label,
-                             gint         response_id)
+                             int          response_id)
 {
   GtkWidget *button;
 
@@ -7166,7 +7166,7 @@ places_shortcut_handler (GtkFileChooserWidget *impl)
 
 static void
 quick_bookmark_handler (GtkFileChooserWidget *impl,
-                        gint                  bookmark_index)
+                        int                   bookmark_index)
 {
   GFile *file;
 
@@ -7225,7 +7225,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
   };
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  gint i;
+  int i;
 
   gobject_class->finalize = gtk_file_chooser_widget_finalize;
   gobject_class->constructed = gtk_file_chooser_widget_constructed;
index a541b88ba987f86ceb436a1523cebee208e78c6c..51121fcba33f69a944e0b79d50cfecb329bf8e22 100644 (file)
@@ -442,7 +442,7 @@ gtk_file_system_model_get_flags (GtkTreeModel *tree_model)
   return GTK_TREE_MODEL_LIST_ONLY;
 }
 
-static gint
+static int
 gtk_file_system_model_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (tree_model);
@@ -452,7 +452,7 @@ gtk_file_system_model_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 gtk_file_system_model_get_column_type (GtkTreeModel *tree_model,
-                                      gint          i)
+                                      int           i)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (tree_model);
   
@@ -473,7 +473,7 @@ static gboolean
 gtk_file_system_model_iter_nth_child (GtkTreeModel *tree_model,
                                      GtkTreeIter  *iter,
                                      GtkTreeIter  *parent,
-                                     gint          n)
+                                     int           n)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (tree_model);
   char *node;
@@ -554,7 +554,7 @@ gtk_file_system_model_get_path (GtkTreeModel *tree_model,
 static void
 gtk_file_system_model_get_value (GtkTreeModel *tree_model,
                                 GtkTreeIter  *iter,
-                                gint          column,
+                                int           column,
                                 GValue       *value)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (tree_model);
@@ -611,7 +611,7 @@ gtk_file_system_model_iter_has_child (GtkTreeModel *tree_model,
   return FALSE;
 }
 
-static gint
+static int
 gtk_file_system_model_iter_n_children (GtkTreeModel *tree_model,
                                       GtkTreeIter  *iter)
 {
@@ -787,7 +787,7 @@ gtk_file_system_model_sort_node (GtkFileSystemModel *model, guint node)
 
 static gboolean
 gtk_file_system_model_get_sort_column_id (GtkTreeSortable  *sortable,
-                                          gint             *sort_column_id,
+                                          int              *sort_column_id,
                                           GtkSortType      *order)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (sortable);
@@ -806,7 +806,7 @@ gtk_file_system_model_get_sort_column_id (GtkTreeSortable  *sortable,
 
 static void
 gtk_file_system_model_set_sort_column_id (GtkTreeSortable  *sortable,
-                                          gint              sort_column_id,
+                                          int               sort_column_id,
                                           GtkSortType       order)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (sortable);
@@ -847,7 +847,7 @@ gtk_file_system_model_set_sort_column_id (GtkTreeSortable  *sortable,
 
 static void
 gtk_file_system_model_set_sort_func (GtkTreeSortable        *sortable,
-                                     gint                    sort_column_id,
+                                     int                     sort_column_id,
                                      GtkTreeIterCompareFunc  func,
                                      gpointer                data,
                                      GDestroyNotify          destroy)
@@ -1265,7 +1265,7 @@ gtk_file_system_model_got_enumerator (GObject *dir, GAsyncResult *res, gpointer
 
 static void
 gtk_file_system_model_set_n_columns (GtkFileSystemModel *model,
-                                     gint                n_columns,
+                                     int                 n_columns,
                                      va_list             args)
 {
   guint i;
index 8ac3ff9f7e77ef94b1d02b9fb9b9a4df57c9c6de..9a2315372a3b5ce1e80f2a8b23b0ab565cc30199 100644 (file)
@@ -115,7 +115,7 @@ static void gtk_flow_box_apply_filter        (GtkFlowBox      *box,
                                               GtkFlowBoxChild *child);
 static void gtk_flow_box_apply_sort          (GtkFlowBox      *box,
                                               GtkFlowBoxChild *child);
-static gint gtk_flow_box_sort                (GtkFlowBoxChild *a,
+static int gtk_flow_box_sort                 (GtkFlowBoxChild *a,
                                               GtkFlowBoxChild *b,
                                               GtkFlowBox      *box);
 
@@ -133,18 +133,18 @@ static void gtk_flow_box_check_model_compat  (GtkFlowBox *box);
 static void
 path_from_horizontal_line_rects (cairo_t      *cr,
                                  GdkRectangle *lines,
-                                 gint          n_lines)
+                                 int           n_lines)
 {
-  gint start_line, end_line;
+  int start_line, end_line;
   GdkRectangle *r;
-  gint i;
+  int i;
 
   /* Join rows vertically by extending to the middle */
   for (i = 0; i < n_lines - 1; i++)
     {
       GdkRectangle *r1 = &lines[i];
       GdkRectangle *r2 = &lines[i+1];
-      gint gap, old;
+      int gap, old;
 
       gap = r2->y - (r1->y + r1->height);
       r1->height += gap / 2;
@@ -191,18 +191,18 @@ path_from_horizontal_line_rects (cairo_t      *cr,
 static void
 path_from_vertical_line_rects (cairo_t      *cr,
                                GdkRectangle *lines,
-                               gint          n_lines)
+                               int           n_lines)
 {
-  gint start_line, end_line;
+  int start_line, end_line;
   GdkRectangle *r;
-  gint i;
+  int i;
 
   /* Join rows horizontally by extending to the middle */
   for (i = 0; i < n_lines - 1; i++)
     {
       GdkRectangle *r1 = &lines[i];
       GdkRectangle *r2 = &lines[i+1];
-      gint gap, old;
+      int gap, old;
 
       gap = r2->x - (r1->x + r1->width);
       r1->width += gap / 2;
@@ -609,7 +609,7 @@ gtk_flow_box_child_get_child (GtkFlowBoxChild *self)
  * Returns: the index of the @child, or -1 if the @child is not
  *     in a flow box.
  */
-gint
+int
 gtk_flow_box_child_get_index (GtkFlowBoxChild *child)
 {
   GtkFlowBoxChildPrivate *priv;
@@ -739,7 +739,7 @@ struct _GtkFlowBoxClass
   void (*toggle_cursor_child)        (GtkFlowBox        *box);
   gboolean (*move_cursor)            (GtkFlowBox        *box,
                                       GtkMovementStep    step,
-                                      gint               count,
+                                      int                count,
                                       gboolean           extend,
                                       gboolean           modify);
   void (*select_all)                 (GtkFlowBox        *box);
@@ -832,11 +832,11 @@ child_is_visible (GtkWidget *child)
          gtk_widget_get_child_visible (child);
 }
 
-static gint
+static int
 get_visible_children (GtkFlowBox *box)
 {
   GSequenceIter *iter;
-  gint i = 0;
+  int i = 0;
 
   for (iter = g_sequence_get_begin_iter (BOX_PRIV (box)->children);
        !g_sequence_iter_is_end (iter);
@@ -1171,7 +1171,7 @@ gtk_flow_box_get_above_focusable (GtkFlowBox    *box,
                                   GSequenceIter *iter)
 {
   GtkFlowBoxChild *child = NULL;
-  gint i;
+  int i;
 
   while (TRUE)
     {
@@ -1197,7 +1197,7 @@ gtk_flow_box_get_below_focusable (GtkFlowBox    *box,
                                   GSequenceIter *iter)
 {
   GtkFlowBoxChild *child = NULL;
-  gint i;
+  int i;
 
   while (TRUE)
     {
@@ -1228,19 +1228,19 @@ gtk_flow_box_get_below_focusable (GtkFlowBox    *box,
 static void
 get_max_item_size (GtkFlowBox     *box,
                    GtkOrientation  orientation,
-                   gint           *min_size,
-                   gint           *nat_size)
+                   int            *min_size,
+                   int            *nat_size)
 {
   GSequenceIter *iter;
-  gint max_min_size = 0;
-  gint max_nat_size = 0;
+  int max_min_size = 0;
+  int max_nat_size = 0;
 
   for (iter = g_sequence_get_begin_iter (BOX_PRIV (box)->children);
        !g_sequence_iter_is_end (iter);
        iter = g_sequence_iter_next (iter))
     {
       GtkWidget *child;
-      gint child_min, child_nat;
+      int child_min, child_nat;
 
       child = g_sequence_get (iter);
 
@@ -1269,20 +1269,20 @@ get_max_item_size (GtkFlowBox     *box,
 static void
 get_largest_size_for_opposing_orientation (GtkFlowBox     *box,
                                            GtkOrientation  orientation,
-                                           gint            item_size,
-                                           gint           *min_item_size,
-                                           gint           *nat_item_size)
+                                           int             item_size,
+                                           int            *min_item_size,
+                                           int            *nat_item_size)
 {
   GSequenceIter *iter;
-  gint max_min_size = 0;
-  gint max_nat_size = 0;
+  int max_min_size = 0;
+  int max_nat_size = 0;
 
   for (iter = g_sequence_get_begin_iter (BOX_PRIV (box)->children);
        !g_sequence_iter_is_end (iter);
        iter = g_sequence_iter_next (iter))
     {
       GtkWidget *child;
-      gint       child_min, child_nat;
+      int        child_min, child_nat;
 
       child = g_sequence_get (iter);
 
@@ -1312,16 +1312,16 @@ static GSequenceIter *
 get_largest_size_for_line_in_opposing_orientation (GtkFlowBox       *box,
                                                    GtkOrientation    orientation,
                                                    GSequenceIter    *cursor,
-                                                   gint              line_length,
+                                                   int               line_length,
                                                    GtkRequestedSize *item_sizes,
-                                                   gint              extra_pixels,
-                                                   gint             *min_item_size,
-                                                   gint             *nat_item_size)
+                                                   int               extra_pixels,
+                                                   int              *min_item_size,
+                                                   int              *nat_item_size)
 {
   GSequenceIter *iter;
-  gint max_min_size = 0;
-  gint max_nat_size = 0;
-  gint i;
+  int max_min_size = 0;
+  int max_nat_size = 0;
+  int i;
 
   i = 0;
   for (iter = cursor;
@@ -1329,7 +1329,7 @@ get_largest_size_for_line_in_opposing_orientation (GtkFlowBox       *box,
        iter = g_sequence_iter_next (iter))
     {
       GtkWidget *child;
-      gint child_min, child_nat, this_item_size;
+      int child_min, child_nat, this_item_size;
 
       child = g_sequence_get (iter);
 
@@ -1366,17 +1366,17 @@ get_largest_size_for_line_in_opposing_orientation (GtkFlowBox       *box,
 }
 
 /* fit_aligned_item_requests() helper */
-static gint
+static int
 gather_aligned_item_requests (GtkFlowBox       *box,
                               GtkOrientation    orientation,
-                              gint              line_length,
-                              gint              item_spacing,
-                              gint              n_children,
+                              int               line_length,
+                              int               item_spacing,
+                              int               n_children,
                               GtkRequestedSize *item_sizes)
 {
   GSequenceIter *iter;
-  gint i;
-  gint extra_items, natural_line_size = 0;
+  int i;
+  int extra_items, natural_line_size = 0;
 
   extra_items = n_children % line_length;
 
@@ -1387,8 +1387,8 @@ gather_aligned_item_requests (GtkFlowBox       *box,
     {
       GtkWidget *child;
       GtkAlign item_align;
-      gint child_min, child_nat;
-      gint position;
+      int child_min, child_nat;
+      int position;
 
       child = g_sequence_get (iter);
 
@@ -1424,14 +1424,14 @@ gather_aligned_item_requests (GtkFlowBox       *box,
 static GtkRequestedSize *
 fit_aligned_item_requests (GtkFlowBox     *box,
                            GtkOrientation  orientation,
-                           gint            avail_size,
-                           gint            item_spacing,
-                           gint           *line_length, /* in-out */
-                           gint            items_per_line,
-                           gint            n_children)
+                           int             avail_size,
+                           int             item_spacing,
+                           int            *line_length, /* in-out */
+                           int             items_per_line,
+                           int             n_children)
 {
   GtkRequestedSize *sizes, *try_sizes;
-  gint try_line_size, try_length;
+  int try_line_size, try_length;
 
   sizes = g_new0 (GtkRequestedSize, *line_length);
 
@@ -1478,14 +1478,14 @@ fit_aligned_item_requests (GtkFlowBox     *box,
 
 typedef struct {
   GArray *requested;
-  gint    extra_pixels;
+  int     extra_pixels;
 } AllocatedLine;
 
-static gint
+static int
 get_offset_pixels (GtkAlign align,
-                   gint     pixels)
+                   int      pixels)
 {
-  gint offset;
+  int offset;
 
   switch (align) {
   case GTK_ALIGN_START:
@@ -1516,19 +1516,19 @@ gtk_flow_box_size_allocate (GtkWidget *widget,
   GtkFlowBox *box = GTK_FLOW_BOX (widget);
   GtkFlowBoxPrivate  *priv = BOX_PRIV (box);
   GtkAllocation child_allocation;
-  gint avail_size, avail_other_size, min_items, item_spacing, line_spacing;
+  int avail_size, avail_other_size, min_items, item_spacing, line_spacing;
   GtkAlign item_align;
   GtkAlign line_align;
   GtkRequestedSize *line_sizes = NULL;
   GtkRequestedSize *item_sizes = NULL;
-  gint min_item_size, nat_item_size;
-  gint line_length;
-  gint item_size = 0;
-  gint line_size = 0, min_fixed_line_size = 0, nat_fixed_line_size = 0;
-  gint line_offset, item_offset, n_children, n_lines, line_count;
-  gint extra_pixels = 0, extra_per_item = 0, extra_extra = 0;
-  gint extra_line_pixels = 0, extra_per_line = 0, extra_line_extra = 0;
-  gint i, this_line_size;
+  int min_item_size, nat_item_size;
+  int line_length;
+  int item_size = 0;
+  int line_size = 0, min_fixed_line_size = 0, nat_fixed_line_size = 0;
+  int line_offset, item_offset, n_children, n_lines, line_count;
+  int extra_pixels = 0, extra_per_item = 0, extra_extra = 0;
+  int extra_line_pixels = 0, extra_per_line = 0, extra_line_extra = 0;
+  int i, this_line_size;
   GSequenceIter *iter;
 
   min_items = MAX (1, priv->min_children_per_line);
@@ -1755,8 +1755,8 @@ gtk_flow_box_size_allocate (GtkWidget *widget,
        iter = g_sequence_iter_next (iter))
     {
       GtkWidget *child;
-      gint position;
-      gint this_item_size;
+      int position;
+      int this_item_size;
 
       child = g_sequence_get (iter);
 
@@ -1804,7 +1804,7 @@ gtk_flow_box_size_allocate (GtkWidget *widget,
                * any leading items */
               if (line_count == n_lines -1)
                 {
-                  gint extra_items = n_children % line_length;
+                  int extra_items = n_children % line_length;
 
                   if (priv->homogeneous)
                     {
@@ -1813,7 +1813,7 @@ gtk_flow_box_size_allocate (GtkWidget *widget,
                     }
                   else
                     {
-                      gint j;
+                      int j;
 
                       for (j = 0; j < (line_length - extra_items); j++)
                         {
@@ -1828,7 +1828,7 @@ gtk_flow_box_size_allocate (GtkWidget *widget,
       /* Push the index along for the last line when spreading to the end */
       if (item_align == GTK_ALIGN_END && line_count == n_lines -1)
         {
-          gint extra_items = n_children % line_length;
+          int extra_items = n_children % line_length;
 
           position += line_length - extra_items;
         }
@@ -1891,14 +1891,14 @@ gtk_flow_box_get_request_mode (GtkWidget *widget)
 static void
 get_largest_aligned_line_length (GtkFlowBox     *box,
                                  GtkOrientation  orientation,
-                                 gint            line_length,
-                                 gint           *min_size,
-                                 gint           *nat_size)
+                                 int             line_length,
+                                 int            *min_size,
+                                 int            *nat_size)
 {
   GSequenceIter *iter;
-  gint max_min_size = 0;
-  gint max_nat_size = 0;
-  gint spacing, i;
+  int max_min_size = 0;
+  int max_nat_size = 0;
+  int spacing, i;
   GtkRequestedSize *aligned_item_sizes;
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -1916,7 +1916,7 @@ get_largest_aligned_line_length (GtkFlowBox     *box,
        iter = g_sequence_iter_next (iter))
     {
       GtkWidget *child;
-      gint child_min, child_nat;
+      int child_min, child_nat;
 
       child = g_sequence_get (iter);
       if (!child_is_visible (child))
@@ -1970,9 +1970,9 @@ gtk_flow_box_measure (GtkWidget      *widget,
     {
       if (for_size < 0)
         {
-          gint min_item_width, nat_item_width;
-          gint min_items, nat_items;
-          gint min_width, nat_width;
+          int min_item_width, nat_item_width;
+          int min_items, nat_items;
+          int min_width, nat_width;
 
           min_items = MAX (1, priv->min_children_per_line);
           nat_items = MAX (min_items, priv->max_children_per_line);
@@ -1998,7 +1998,7 @@ gtk_flow_box_measure (GtkWidget      *widget,
                     }
                   else
                     {
-                      gint min_line_length, nat_line_length;
+                      int min_line_length, nat_line_length;
 
                       get_largest_aligned_line_length (box,
                                                        GTK_ORIENTATION_HORIZONTAL,
@@ -2033,7 +2033,7 @@ gtk_flow_box_measure (GtkWidget      *widget,
           else /* GTK_ORIENTATION_VERTICAL */
             {
               /* Return the width for the minimum height */
-              gint min_height;
+              int min_height;
               int dummy;
 
               gtk_flow_box_measure (widget,
@@ -2053,10 +2053,10 @@ gtk_flow_box_measure (GtkWidget      *widget,
         }
       else
         {
-          gint min_item_height, nat_item_height;
-          gint min_items;
-          gint min_width, nat_width;
-          gint avail_size, n_children;
+          int min_item_height, nat_item_height;
+          int min_items;
+          int min_width, nat_width;
+          int avail_size, n_children;
 
           min_items = MAX (1, priv->min_children_per_line);
 
@@ -2074,9 +2074,9 @@ gtk_flow_box_measure (GtkWidget      *widget,
             }
           else /* GTK_ORIENTATION_VERTICAL */
             {
-              gint min_height;
-              gint line_length;
-              gint item_size, extra_pixels;
+              int min_height;
+              int line_length;
+              int item_size, extra_pixels;
               int dummy;
 
               n_children = get_visible_children (box);
@@ -2126,8 +2126,8 @@ gtk_flow_box_measure (GtkWidget      *widget,
 
               if (priv->homogeneous)
                 {
-                  gint min_item_width, nat_item_width;
-                  gint lines;
+                  int min_item_width, nat_item_width;
+                  int lines;
 
                   /* Here we just use the largest height-for-width and
                    * add up the size accordingly
@@ -2152,7 +2152,7 @@ gtk_flow_box_measure (GtkWidget      *widget,
                 }
               else
                 {
-                  gint min_line_width, nat_line_width, i;
+                  int min_line_width, nat_line_width, i;
                   gboolean first_line = TRUE;
                   GtkRequestedSize *item_sizes;
                   GSequenceIter *iter;
@@ -2216,9 +2216,9 @@ gtk_flow_box_measure (GtkWidget      *widget,
     {
       if (for_size < 0)
         {
-          gint min_item_height, nat_item_height;
-          gint min_items, nat_items;
-          gint min_height, nat_height;
+          int min_item_height, nat_item_height;
+          int min_items, nat_items;
+          int min_height, nat_height;
 
           min_items = MAX (1, priv->min_children_per_line);
           nat_items = MAX (min_items, priv->max_children_per_line);
@@ -2226,7 +2226,7 @@ gtk_flow_box_measure (GtkWidget      *widget,
           if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
             {
               /* Return the height for the minimum width */
-              gint min_width;
+              int min_width;
               int dummy;
 
               gtk_flow_box_measure (widget,
@@ -2259,7 +2259,7 @@ gtk_flow_box_measure (GtkWidget      *widget,
                     }
                   else
                     {
-                      gint min_line_length, nat_line_length;
+                      int min_line_length, nat_line_length;
 
                       get_largest_aligned_line_length (box,
                                                        GTK_ORIENTATION_VERTICAL,
@@ -2302,10 +2302,10 @@ gtk_flow_box_measure (GtkWidget      *widget,
         }
       else
         {
-          gint min_item_width, nat_item_width;
-          gint min_items;
-          gint min_height, nat_height;
-          gint avail_size, n_children;
+          int min_item_width, nat_item_width;
+          int min_items;
+          int min_height, nat_height;
+          int avail_size, n_children;
 
           min_items = MAX (1, priv->min_children_per_line);
 
@@ -2314,9 +2314,9 @@ gtk_flow_box_measure (GtkWidget      *widget,
 
           if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
             {
-              gint min_width;
-              gint line_length;
-              gint item_size, extra_pixels;
+              int min_width;
+              int line_length;
+              int item_size, extra_pixels;
               int dummy;
 
               n_children = get_visible_children (box);
@@ -2366,8 +2366,8 @@ gtk_flow_box_measure (GtkWidget      *widget,
 
               if (priv->homogeneous)
                 {
-                  gint min_item_height, nat_item_height;
-                  gint lines;
+                  int min_item_height, nat_item_height;
+                  int lines;
 
                   /* Here we just use the largest height-for-width and
                    * add up the size accordingly
@@ -2391,7 +2391,7 @@ gtk_flow_box_measure (GtkWidget      *widget,
                 }
               else
                 {
-                  gint min_line_height, nat_line_height, i;
+                  int min_line_height, nat_line_height, i;
                   gboolean first_line = TRUE;
                   GtkRequestedSize *item_sizes;
                   GSequenceIter *iter;
@@ -2701,13 +2701,13 @@ get_view_rect (GtkFlowBox   *box,
 
 static void
 update_autoscroll_mode (GtkFlowBox *box,
-                        gint        x,
-                        gint        y)
+                        int         x,
+                        int         y)
 {
   GtkFlowBoxPrivate *priv = BOX_PRIV (box);
   GtkScrollType mode = GTK_SCROLL_NONE;
   GdkRectangle rect;
-  gint size, pos;
+  int size, pos;
 
   if (priv->rubberband_select && get_view_rect (box, &rect))
     {
@@ -3127,7 +3127,7 @@ gtk_flow_box_add_move_binding (GtkWidgetClass  *widget_class,
                                guint            keyval,
                                GdkModifierType  modmask,
                                GtkMovementStep  step,
-                               gint             count)
+                               int              count)
 {
   gtk_widget_class_add_binding_signal (widget_class,
                                        keyval, modmask,
@@ -3180,7 +3180,7 @@ gtk_flow_box_disable_move_cursor (GtkFlowBox *box)
 static gboolean
 gtk_flow_box_move_cursor (GtkFlowBox      *box,
                           GtkMovementStep  step,
-                          gint             count,
+                          int              count,
                           gboolean         extend,
                           gboolean         modify)
 {
@@ -3189,9 +3189,9 @@ gtk_flow_box_move_cursor (GtkFlowBox      *box,
   GtkFlowBoxChild *prev;
   GtkFlowBoxChild *next;
   GtkAllocation allocation;
-  gint page_size;
+  int page_size;
   GSequenceIter *iter;
-  gint start;
+  int start;
   GtkAdjustment *adjustment;
   gboolean vertical;
 
@@ -3286,7 +3286,7 @@ gtk_flow_box_move_cursor (GtkFlowBox      *box,
 
           if (count < 0)
             {
-              gint i = 0;
+              int i = 0;
 
               /* Up */
               while (iter != NULL)
@@ -3311,7 +3311,7 @@ gtk_flow_box_move_cursor (GtkFlowBox      *box,
             }
           else
             {
-              gint i = 0;
+              int i = 0;
 
               /* Down */
               while (!g_sequence_iter_is_end (iter))
@@ -3946,7 +3946,7 @@ gtk_flow_box_bound_model_changed (GListModel *list,
 {
   GtkFlowBox *box = user_data;
   GtkFlowBoxPrivate *priv = BOX_PRIV (box);
-  gint i;
+  int i;
 
   while (removed--)
     {
@@ -4058,7 +4058,7 @@ gtk_flow_box_insert_css_node (GtkFlowBox    *box,
 void
 gtk_flow_box_insert (GtkFlowBox *box,
                      GtkWidget  *widget,
-                     gint        position)
+                     int         position)
 {
   GtkFlowBoxPrivate *priv;
   GtkFlowBoxChild *child;
@@ -4111,7 +4111,7 @@ gtk_flow_box_insert (GtkFlowBox *box,
  */
 GtkFlowBoxChild *
 gtk_flow_box_get_child_at_index (GtkFlowBox *box,
-                                 gint        idx)
+                                 int         idx)
 {
   GSequenceIter *iter;
 
@@ -4139,8 +4139,8 @@ gtk_flow_box_get_child_at_index (GtkFlowBox *box,
  */
 GtkFlowBoxChild *
 gtk_flow_box_get_child_at_pos (GtkFlowBox *box,
-                               gint        x,
-                               gint        y)
+                               int         x,
+                               int         y)
 {
   GtkWidget *child = gtk_widget_pick (GTK_WIDGET (box), x, y, GTK_PICK_DEFAULT);
 
@@ -4893,7 +4893,7 @@ gtk_flow_box_set_sort_func (GtkFlowBox         *box,
   gtk_flow_box_invalidate_sort (box);
 }
 
-static gint
+static int
 gtk_flow_box_sort (GtkFlowBoxChild *a,
                    GtkFlowBoxChild *b,
                    GtkFlowBox      *box)
index da8b1ceb3ed59a272c719b5bae3b81e843717604..1b8f8115537a5dc9e0b3e62a1cc65886af3c5991 100644 (file)
@@ -88,7 +88,7 @@ GDK_AVAILABLE_IN_ALL
 GtkWidget *           gtk_flow_box_child_get_child          (GtkFlowBoxChild *self);
 
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_flow_box_child_get_index           (GtkFlowBoxChild *child);
+int                   gtk_flow_box_child_get_index           (GtkFlowBoxChild *child);
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_flow_box_child_is_selected         (GtkFlowBoxChild *child);
 GDK_AVAILABLE_IN_ALL
@@ -145,18 +145,18 @@ gboolean              gtk_flow_box_get_activate_on_single_click (GtkFlowBox
 GDK_AVAILABLE_IN_ALL
 void                  gtk_flow_box_insert                       (GtkFlowBox        *box,
                                                                  GtkWidget         *widget,
-                                                                 gint               position);
+                                                                 int                position);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_flow_box_remove                       (GtkFlowBox        *box,
                                                                  GtkWidget         *widget);
 GDK_AVAILABLE_IN_ALL
 GtkFlowBoxChild      *gtk_flow_box_get_child_at_index           (GtkFlowBox        *box,
-                                                                 gint               idx);
+                                                                 int                idx);
 
 GDK_AVAILABLE_IN_ALL
 GtkFlowBoxChild      *gtk_flow_box_get_child_at_pos             (GtkFlowBox        *box,
-                                                                 gint               x,
-                                                                 gint               y);
+                                                                 int                x,
+                                                                 int                y);
 
 typedef void (* GtkFlowBoxForeachFunc) (GtkFlowBox      *box,
                                         GtkFlowBoxChild *child,
@@ -201,9 +201,9 @@ void                  gtk_flow_box_set_filter_func              (GtkFlowBox
 GDK_AVAILABLE_IN_ALL
 void                  gtk_flow_box_invalidate_filter            (GtkFlowBox        *box);
 
-typedef gint (*GtkFlowBoxSortFunc) (GtkFlowBoxChild *child1,
-                                    GtkFlowBoxChild *child2,
-                                    gpointer         user_data);
+typedef int (*GtkFlowBoxSortFunc) (GtkFlowBoxChild *child1,
+                                   GtkFlowBoxChild *child2,
+                                   gpointer         user_data);
 
 GDK_AVAILABLE_IN_ALL
 void                  gtk_flow_box_set_sort_func                (GtkFlowBox        *box,
index 86121c2e2afa763d19f734754dddd333e13f524f..11ee713591fa3aa5e4c250d1b24fcfae71a727da 100644 (file)
@@ -86,7 +86,7 @@ struct _GtkFontButton
   PangoFontFamily      *font_family;
   PangoFontFace        *font_face;
   PangoFontMap         *font_map;
-  gint                  font_size;
+  int                   font_size;
   char                 *font_features;
   PangoLanguage        *language;
   gchar                *preview_text;
@@ -137,7 +137,7 @@ static void gtk_font_button_clicked                 (GtkButton         *button,
 
 /* Dialog response functions */
 static void response_cb                             (GtkDialog         *dialog,
-                                                     gint               response_id,
+                                                     int                response_id,
                                                      gpointer           data);
 static void dialog_destroy                          (GtkWidget         *widget,
                                                      gpointer           data);
@@ -218,7 +218,7 @@ gtk_font_button_update_font_data (GtkFontButton *font_button)
 {
   PangoFontFamily **families;
   PangoFontFace **faces;
-  gint n_families, n_faces, i;
+  int n_families, n_faces, i;
   const gchar *family;
 
   g_assert (font_button->font_desc != NULL);
@@ -983,7 +983,7 @@ gtk_font_button_clicked (GtkButton *button,
 
 static void
 response_cb (GtkDialog *dialog,
-             gint       response_id,
+             int        response_id,
              gpointer   data)
 {
   GtkFontButton *font_button = GTK_FONT_BUTTON (data);
index 497c3247ca4e61a72f4b5a661ecd0aa9f6db3521..7fdf0413959462cd3c60587f055b568bc9cdc257 100644 (file)
@@ -222,7 +222,7 @@ gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser)
  * Returns: A n integer representing the selected font size,
  *     or -1 if no font size is selected.
  */
-gint
+int
 gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), -1);
index 922258839cd6ca9d926f778f8eea08ab154ad131..96c9825927e6aa15782e06eabb16ba00fd4ad7db 100644 (file)
@@ -81,7 +81,7 @@ struct _GtkFontChooserIface
   /* Methods */
   PangoFontFamily * (* get_font_family)         (GtkFontChooser  *fontchooser);
   PangoFontFace *   (* get_font_face)           (GtkFontChooser  *fontchooser);
-  gint              (* get_font_size)           (GtkFontChooser  *fontchooser);
+  int               (* get_font_size)           (GtkFontChooser  *fontchooser);
 
   void              (* set_filter_func)         (GtkFontChooser   *fontchooser,
                                                  GtkFontFilterFunc filter,
@@ -109,7 +109,7 @@ PangoFontFamily *gtk_font_chooser_get_font_family          (GtkFontChooser   *fo
 GDK_AVAILABLE_IN_ALL
 PangoFontFace   *gtk_font_chooser_get_font_face            (GtkFontChooser   *fontchooser);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_font_chooser_get_font_size            (GtkFontChooser   *fontchooser);
+int              gtk_font_chooser_get_font_size            (GtkFontChooser   *fontchooser);
 
 GDK_AVAILABLE_IN_ALL
 PangoFontDescription *
index 42101f29d34f077c66a3a53d033bc5d8a761947f..69f0771660de6bbdcd3ad72bbeacb4b68a59c390 100644 (file)
@@ -326,8 +326,8 @@ gtk_font_chooser_widget_update_marks (GtkFontChooserWidget *self)
 {
   GtkAdjustment *adj, *spin_adj;
   const int *sizes;
-  gint *font_sizes;
-  gint i, n_sizes;
+  int *font_sizes;
+  int i, n_sizes;
   gdouble value, spin_value;
   gpointer item;
 
@@ -356,7 +356,7 @@ gtk_font_chooser_widget_update_marks (GtkFontChooserWidget *self)
 
   if (n_sizes < 2)
     {
-      static const gint fallback_sizes[] = {
+      static const int fallback_sizes[] = {
         6, 8, 9, 10, 11, 12, 13, 14, 16, 20, 24, 36, 48, 72
       };
 
@@ -955,7 +955,7 @@ gtk_font_chooser_widget_get_family (GtkFontChooser *chooser)
     return pango_font_face_get_family (item);
 }
 
-static gint
+static int
 gtk_font_chooser_widget_get_size (GtkFontChooser *chooser)
 {
   GtkFontChooserWidget *fontchooser = GTK_FONT_CHOOSER_WIDGET (chooser);
@@ -1223,7 +1223,7 @@ find_language_and_script (GtkFontChooserWidget *fontchooser,
                           hb_tag_t             *lang_tag,
                           hb_tag_t             *script_tag)
 {
-  gint i, j, k;
+  int i, j, k;
   hb_tag_t scripts[80];
   unsigned int n_scripts;
   unsigned int count;
index 5042b1b3462fd8a1028aa4ad24291227d9d07bbd..89ee7d55c6081c86a42b54e960fb380f21674941 100644 (file)
@@ -128,11 +128,11 @@ static void gtk_frame_buildable_add_child           (GtkBuildable *buildable,
                                                      const gchar  *type);
 static void     gtk_frame_measure (GtkWidget           *widget,
                                    GtkOrientation       orientation,
-                                   gint                 for_size,
-                                   gint                *minimum_size,
-                                   gint                *natural_size,
-                                   gint                *minimum_baseline,
-                                   gint                *natural_baseline);
+                                   int                  for_size,
+                                   int                 *minimum_size,
+                                   int                 *natural_size,
+                                   int                 *minimum_baseline,
+                                   int                 *natural_baseline);
 static void     gtk_frame_compute_expand (GtkWidget *widget,
                                           gboolean  *hexpand,
                                           gboolean  *vexpand);
@@ -533,14 +533,14 @@ gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
 {
   GtkFramePrivate *priv = gtk_frame_get_instance_private (frame);
   int frame_width, frame_height;
-  gint height;
+  int height;
 
   frame_width = gtk_widget_get_width (GTK_WIDGET (frame));
   frame_height = gtk_widget_get_height (GTK_WIDGET (frame));
 
   if (priv->label_widget)
     {
-      gint nat_width, width;
+      int nat_width, width;
 
       gtk_widget_measure (priv->label_widget, GTK_ORIENTATION_HORIZONTAL, -1,
                           NULL, &nat_width, NULL, NULL);
@@ -560,11 +560,11 @@ gtk_frame_real_compute_child_allocation (GtkFrame      *frame,
 static void
 gtk_frame_measure (GtkWidget      *widget,
                    GtkOrientation  orientation,
-                   gint            for_size,
-                   gint            *minimum,
-                   gint            *natural,
-                   gint            *minimum_baseline,
-                   gint            *natural_baseline)
+                   int             for_size,
+                   int             *minimum,
+                   int             *natural,
+                   int             *minimum_baseline,
+                   int             *natural_baseline)
 {
   GtkFrame *frame = GTK_FRAME (widget);
   GtkFramePrivate *priv = gtk_frame_get_instance_private (frame);
index 6e3f825932d086ed67351e2806988abc208f4b71..64d04f780ff6f4baa65559193afcf78b03ad7b36 100644 (file)
@@ -32,11 +32,11 @@ struct _GtkGestureClickClass
   GtkGestureSingleClass parent_class;
 
   void     (* pressed)  (GtkGestureClick *gesture,
-                         gint             n_press,
+                         int              n_press,
                          gdouble          x,
                          gdouble          y);
   void     (* released) (GtkGestureClick *gesture,
-                         gint             n_press,
+                         int              n_press,
                          gdouble          x,
                          gdouble          y);
   void     (* stopped)  (GtkGestureClick *gesture);
index 4906abd2bfac679eb768e6ac6e68cc06f148c1dd..777debc9aac090262df83d1cfa57fd629057145d 100644 (file)
@@ -119,7 +119,7 @@ gtk_gesture_long_press_begin (GtkGesture       *gesture,
   GdkEvent *event;
   GdkEventType event_type;
   GtkWidget *widget;
-  gint delay;
+  int delay;
 
   priv = gtk_gesture_long_press_get_instance_private (GTK_GESTURE_LONG_PRESS (gesture));
   sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture));
@@ -139,7 +139,7 @@ gtk_gesture_long_press_begin (GtkGesture       *gesture,
                 "gtk-long-press-time", &delay,
                 NULL);
 
-  delay = (gint)(priv->delay_factor * delay);
+  delay = (int)(priv->delay_factor * delay);
 
   gtk_gesture_get_point (gesture, sequence,
                          &priv->initial_x, &priv->initial_y);
index 094a759553febc0711cc8b0083c7fb5582b3e56f..0db2bb783758621ab306bfd7694baacae5ba1d5b 100644 (file)
@@ -223,7 +223,7 @@ gtk_gesture_stylus_get_axes (GtkGestureStylus  *gesture,
 {
   GdkEvent *event;
   GArray *array;
-  gint i = 0;
+  int i = 0;
 
   g_return_val_if_fail (GTK_IS_GESTURE_STYLUS (gesture), FALSE);
   g_return_val_if_fail (values != NULL, FALSE);
index 5aba66dd70b6953cc9831817038549e32160ac4f..41053840043204968f0bc96175032521255682c2 100644 (file)
@@ -108,11 +108,11 @@ _gtk_gesture_swipe_clear_backlog (GtkGestureSwipe *gesture,
                                   guint32          evtime)
 {
   GtkGestureSwipePrivate *priv;
-  gint i, length = 0;
+  int i, length = 0;
 
   priv = gtk_gesture_swipe_get_instance_private (gesture);
 
-  for (i = 0; i < (gint) priv->events->len; i++)
+  for (i = 0; i < (int) priv->events->len; i++)
     {
       EventData *data;
 
index 107e0940ff2c7162bb4285e8da8558a661ac4888..ddb079c9e9a3ac72016b3f6a13362f8f8840c683 100644 (file)
@@ -650,8 +650,8 @@ gtk_gl_area_size_allocate (GtkWidget *widget,
 static void
 gtk_gl_area_draw_error_screen (GtkGLArea   *area,
                                GtkSnapshot *snapshot,
-                               gint         width,
-                               gint         height)
+                               int          width,
+                               int          height)
 {
   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
   PangoLayout *layout;
@@ -1088,8 +1088,8 @@ gtk_gl_area_get_use_es (GtkGLArea *area)
  */
 void
 gtk_gl_area_set_required_version (GtkGLArea *area,
-                                  gint       major,
-                                  gint       minor)
+                                  int        major,
+                                  int        minor)
 {
   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
 
@@ -1110,8 +1110,8 @@ gtk_gl_area_set_required_version (GtkGLArea *area,
  */
 void
 gtk_gl_area_get_required_version (GtkGLArea *area,
-                                  gint      *major,
-                                  gint      *minor)
+                                  int       *major,
+                                  int       *minor)
 {
   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
 
index 68c1dc6688a9fd6b55b02bab67f65df83c771553..8d0cd0f2ca09411742c3978001fda14fb1bfb248 100644 (file)
@@ -88,12 +88,12 @@ GDK_AVAILABLE_IN_ALL
 gboolean        gtk_gl_area_get_use_es                  (GtkGLArea    *area);
 GDK_AVAILABLE_IN_ALL
 void            gtk_gl_area_set_required_version        (GtkGLArea    *area,
-                                                         gint          major,
-                                                         gint          minor);
+                                                         int           major,
+                                                         int           minor);
 GDK_AVAILABLE_IN_ALL
 void            gtk_gl_area_get_required_version        (GtkGLArea    *area,
-                                                         gint         *major,
-                                                         gint         *minor);
+                                                         int          *major,
+                                                         int          *minor);
 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_gl_area_get_has_depth_buffer        (GtkGLArea    *area);
 GDK_AVAILABLE_IN_ALL
index fcee1db68564e762d5472bb896af272597d109fb..a9cda6bfb57b180fbee84df9059b05de2855eff5 100644 (file)
@@ -185,10 +185,10 @@ gtk_grid_set_property (GObject      *object,
 static void
 grid_attach (GtkGrid   *grid,
              GtkWidget *widget,
-             gint       left,
-             gint       top,
-             gint       width,
-             gint       height)
+             int        left,
+             int        top,
+             int        width,
+             int        height)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkGridLayoutChild *grid_child;
@@ -209,17 +209,17 @@ grid_attach (GtkGrid   *grid,
  * @op_pos, @op_span determine the rows/columns
  * in which the touching has to happen.
  */
-static gint
+static int
 find_attach_position (GtkGrid         *grid,
                       GtkOrientation   orientation,
-                      gint             op_pos,
-                      gint             op_span,
+                      int              op_pos,
+                      int              op_span,
                       gboolean         max)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
   gboolean hit;
-  gint pos;
+  int pos;
 
   if (max)
     pos = -G_MAXINT;
@@ -470,10 +470,10 @@ gtk_grid_new (void)
 void
 gtk_grid_attach (GtkGrid   *grid,
                  GtkWidget *child,
-                 gint       left,
-                 gint       top,
-                 gint       width,
-                 gint       height)
+                 int        left,
+                 int        top,
+                 int        width,
+                 int        height)
 {
   g_return_if_fail (GTK_IS_GRID (grid));
   g_return_if_fail (GTK_IS_WIDGET (child));
@@ -509,12 +509,12 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
                          GtkWidget       *child,
                          GtkWidget       *sibling,
                          GtkPositionType  side,
-                         gint             width,
-                         gint             height)
+                         int              width,
+                         int              height)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkGridLayoutChild *grid_sibling;
-  gint left, top;
+  int left, top;
 
   g_return_if_fail (GTK_IS_GRID (grid));
   g_return_if_fail (GTK_IS_WIDGET (child));
@@ -594,8 +594,8 @@ gtk_grid_attach_next_to (GtkGrid         *grid,
  */
 GtkWidget *
 gtk_grid_get_child_at (GtkGrid *grid,
-                       gint     left,
-                       gint     top)
+                       int      left,
+                       int      top)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
@@ -657,7 +657,7 @@ gtk_grid_remove (GtkGrid   *grid,
  */
 void
 gtk_grid_insert_row (GtkGrid *grid,
-                     gint     position)
+                     int      position)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
@@ -696,7 +696,7 @@ gtk_grid_insert_row (GtkGrid *grid,
  */
 void
 gtk_grid_remove_row (GtkGrid *grid,
-                     gint     position)
+                     int      position)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
@@ -746,7 +746,7 @@ gtk_grid_remove_row (GtkGrid *grid,
  */
 void
 gtk_grid_insert_column (GtkGrid *grid,
-                        gint     position)
+                        int      position)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
@@ -785,7 +785,7 @@ gtk_grid_insert_column (GtkGrid *grid,
  */
 void
 gtk_grid_remove_column (GtkGrid *grid,
-                        gint     position)
+                        int      position)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkWidget *child;
@@ -1059,7 +1059,7 @@ gtk_grid_get_column_spacing (GtkGrid *grid)
  */
 void
 gtk_grid_set_row_baseline_position (GtkGrid            *grid,
-                                   gint                row,
+                                   int                 row,
                                    GtkBaselinePosition pos)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
@@ -1084,7 +1084,7 @@ gtk_grid_set_row_baseline_position (GtkGrid            *grid,
  */
 GtkBaselinePosition
 gtk_grid_get_row_baseline_position (GtkGrid      *grid,
-                                   gint          row)
+                                   int           row)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
 
@@ -1105,7 +1105,7 @@ gtk_grid_get_row_baseline_position (GtkGrid      *grid,
  */
 void
 gtk_grid_set_baseline_row (GtkGrid *grid,
-                          gint     row)
+                          int      row)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   int old_row;
@@ -1128,7 +1128,7 @@ gtk_grid_set_baseline_row (GtkGrid *grid,
  *
  * Returns: the row index defining the global baseline
  */
-gint
+int
 gtk_grid_get_baseline_row (GtkGrid *grid)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
@@ -1152,10 +1152,10 @@ gtk_grid_get_baseline_row (GtkGrid *grid)
 void
 gtk_grid_query_child (GtkGrid   *grid,
                       GtkWidget *child,
-                      gint      *left,
-                      gint      *top,
-                      gint      *width,
-                      gint      *height)
+                      int       *left,
+                      int       *top,
+                      int       *width,
+                      int       *height)
 {
   GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
   GtkGridLayoutChild *grid_child;
index e7b8bd0d7d49290ea4b86995a9db1924eccce630..7c0bbb4ac09a5bacd60b0dce68af7059c44b938b 100644 (file)
@@ -66,37 +66,37 @@ GtkWidget* gtk_grid_new                    (void);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_attach                 (GtkGrid         *grid,
                                             GtkWidget       *child,
-                                            gint             left,
-                                            gint             top,
-                                            gint             width,
-                                            gint             height);
+                                            int              left,
+                                            int              top,
+                                            int              width,
+                                            int              height);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_attach_next_to         (GtkGrid         *grid,
                                             GtkWidget       *child,
                                             GtkWidget       *sibling,
                                             GtkPositionType  side,
-                                            gint             width,
-                                            gint             height);
+                                            int              width,
+                                            int              height);
 GDK_AVAILABLE_IN_ALL
 GtkWidget *gtk_grid_get_child_at           (GtkGrid         *grid,
-                                            gint             left,
-                                            gint             top);
+                                            int              left,
+                                            int              top);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_remove                 (GtkGrid         *grid,
                                             GtkWidget       *child);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_insert_row             (GtkGrid         *grid,
-                                            gint             position);
+                                            int              position);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_insert_column          (GtkGrid         *grid,
-                                            gint             position);
+                                            int              position);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_remove_row             (GtkGrid         *grid,
-                                            gint             position);
+                                            int              position);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_remove_column          (GtkGrid         *grid,
-                                            gint             position);
+                                            int              position);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_insert_next_to         (GtkGrid         *grid,
                                             GtkWidget       *sibling,
@@ -123,24 +123,24 @@ GDK_AVAILABLE_IN_ALL
 guint      gtk_grid_get_column_spacing     (GtkGrid         *grid);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_set_row_baseline_position (GtkGrid      *grid,
-                                               gint          row,
+                                               int           row,
                                                GtkBaselinePosition pos);
 GDK_AVAILABLE_IN_ALL
 GtkBaselinePosition gtk_grid_get_row_baseline_position (GtkGrid      *grid,
-                                                        gint          row);
+                                                        int           row);
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_set_baseline_row       (GtkGrid         *grid,
-                                            gint             row);
+                                            int              row);
 GDK_AVAILABLE_IN_ALL
-gint       gtk_grid_get_baseline_row       (GtkGrid         *grid);
+int        gtk_grid_get_baseline_row       (GtkGrid         *grid);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_grid_query_child            (GtkGrid         *grid,
                                             GtkWidget       *child,
-                                            gint            *left,
-                                            gint            *top,
-                                            gint            *width,
-                                            gint            *height);
+                                            int             *left,
+                                            int             *top,
+                                            int             *width,
+                                            int             *height);
 
 G_END_DECLS
 
index 08fce7fbdea854fc19ca6dfc2340a2ebf4284614..77904f80b2dda2dd21ef4d8c670cd746569c9d2e 100644 (file)
@@ -555,7 +555,7 @@ grid_request_init (GridRequest    *request,
 
 /* Sums allocations for lines spanned by child and their spacing.
  */
-static gint
+static int
 compute_allocation_for_child (GridRequest        *request,
                               GtkGridLayoutChild *child,
                               GtkOrientation      orientation)
@@ -717,8 +717,8 @@ grid_request_homogeneous (GridRequest    *request,
   GtkGridLayout *self = request->layout;
   GridLineData *linedata;
   GridLines *lines;
-  gint minimum, natural;
-  gint i;
+  int minimum, natural;
+  int i;
 
   linedata = &self->linedata[orientation];
   lines = &request->lines[orientation];
@@ -1393,7 +1393,7 @@ gtk_grid_layout_get_size_for_size (GtkGridLayout  *self,
 {
   GridRequest request;
   GridLines *lines;
-  gint min_size, nat_size;
+  int min_size, nat_size;
 
   *minimum = 0;
   *natural = 0;
@@ -1491,7 +1491,7 @@ grid_request_allocate_children (GridRequest *request,
 {
   GtkWidget *child;
   GtkAllocation child_allocation;
-  gint x, y, width, height, baseline, ignore;
+  int x, y, width, height, baseline, ignore;
 
 
   for (child = gtk_widget_get_first_child (request->widget);
index ada3d95c792cde6d82b05ecb25865a68671e9308..60bd57b9bcbe72a941a66bb2b63a76228a5a0084 100644 (file)
@@ -44,7 +44,7 @@
 #define GET_UINT32(cache, offset) (GUINT32_FROM_BE (*(guint32 *)((cache) + (offset))))
 
 struct _GtkIconCache {
-  gint ref_count;
+  int ref_count;
 
   GMappedFile *map;
   gchar *buffer;
@@ -153,13 +153,13 @@ gtk_icon_cache_new (const gchar *data)
   return cache;
 }
 
-static gint
+static int
 get_directory_index (GtkIconCache *cache,
                      const gchar *directory)
 {
   guint32 dir_list_offset;
-  gint n_dirs;
-  gint i;
+  int n_dirs;
+  int i;
 
   dir_list_offset = GET_UINT32 (cache->buffer, 8);
 
@@ -181,7 +181,7 @@ gtk_icon_cache_list_icons_in_directory (GtkIconCache *cache,
                                         const gchar  *directory,
                                         GtkStringSet *set)
 {
-  gint directory_index;
+  int directory_index;
   guint32 hash_offset, n_buckets;
   guint32 chain_offset;
   guint32 image_list_offset, n_images;
index c5e1e338adcceffeca683133e52cb84e3d289b0d..c074b113914259cd0c8cc8b56986d31537b74e6b 100644 (file)
@@ -31,7 +31,7 @@ typedef struct {
   const gchar *cache;
   gsize cache_size;
   guint32 n_directories;
-  gint flags;
+  int flags;
 } CacheInfo;
 
 gboolean gtk_icon_cache_validate (CacheInfo *info);
index 872a30fda3488453724f6052bdb02875e52018c2..597a1f0a25a960df532e366fa167558c2db79a03 100644 (file)
@@ -42,7 +42,7 @@ struct _GtkIconHelper
 
   GtkImageDefinition *def;
 
-  gint pixel_size;
+  int pixel_size;
 
   guint use_fallback : 1;
   guint texture_is_symbolic : 1;
@@ -85,13 +85,13 @@ static GdkPaintable *
 ensure_paintable_for_gicon (GtkIconHelper    *self,
                             GtkCssStyle      *style,
                             GtkTextDirection  dir,
-                            gint              scale,
+                            int               scale,
                             gboolean          preload,
                             GIcon            *gicon,
                             gboolean         *symbolic)
 {
   GtkIconTheme *icon_theme;
-  gint width, height;
+  int width, height;
   GtkIconPaintable *icon;
   GtkIconLookupFlags flags;
 
@@ -492,7 +492,7 @@ _gtk_icon_helper_set_paintable (GtkIconHelper *self,
 
 gboolean
 _gtk_icon_helper_set_pixel_size (GtkIconHelper *self,
-                                 gint           pixel_size)
+                                 int            pixel_size)
 {
   if (self->pixel_size != pixel_size)
     {
@@ -528,7 +528,7 @@ _gtk_icon_helper_get_use_fallback (GtkIconHelper *self)
   return self->use_fallback;
 }
 
-gint
+int
 _gtk_icon_helper_get_pixel_size (GtkIconHelper *self)
 {
   return self->pixel_size;
index 1b51eaa2505aed0040d9255dd1ca5ce80792ab54..eea43513372f2708082bd41af8b4660a52d300aa 100644 (file)
@@ -50,12 +50,12 @@ void _gtk_icon_helper_set_paintable (GtkIconHelper *self,
                                     GdkPaintable  *paintable);
 
 gboolean _gtk_icon_helper_set_pixel_size   (GtkIconHelper *self,
-                                            gint           pixel_size);
+                                            int            pixel_size);
 gboolean _gtk_icon_helper_set_use_fallback (GtkIconHelper *self,
                                             gboolean       use_fallback);
 
 GtkImageType _gtk_icon_helper_get_storage_type (GtkIconHelper *self);
-gint _gtk_icon_helper_get_pixel_size (GtkIconHelper *self);
+int _gtk_icon_helper_get_pixel_size (GtkIconHelper *self);
 gboolean _gtk_icon_helper_get_use_fallback (GtkIconHelper *self);
 
 GIcon *_gtk_icon_helper_peek_gicon (GtkIconHelper *self);
index 068ca174a55af5f1b505cd7919711cd2f31c0a33..39d193785fe9720c9bef167f95a601262dd85408 100644 (file)
@@ -349,8 +349,8 @@ struct _GtkIconThemeClass
 
 typedef struct {
   gchar **icon_names;
-  gint size;
-  gint scale;
+  int size;
+  int scale;
   GtkIconLookupFlags flags;
 } IconKey;
 
@@ -389,8 +389,8 @@ struct _GtkIconPaintable
 
   /* Parameters influencing the scaled icon
    */
-  gint desired_size;
-  gint desired_scale;
+  int desired_size;
+  int desired_scale;
   guint is_svg          : 1;
   guint is_resource     : 1;
   guint is_symbolic     : 1;
@@ -427,11 +427,11 @@ typedef struct
 typedef struct
 {
   IconThemeDirType type;
-  gint size;
-  gint min_size;
-  gint max_size;
-  gint threshold;
-  gint scale;
+  int size;
+  int min_size;
+  int max_size;
+  int threshold;
+  int scale;
 
   GArray *icon_files;
   GHashTable *icon_hash; /* name (interned) -> file index */
@@ -467,8 +467,8 @@ static void              theme_dir_destroy                (IconThemeDir     *dir
 static void              theme_destroy                    (IconTheme        *theme);
 static GtkIconPaintable *theme_lookup_icon                (IconTheme        *theme,
                                                            const gchar      *icon_name,
-                                                           gint              size,
-                                                           gint              scale,
+                                                           int               size,
+                                                           int               scale,
                                                            gboolean          allow_svg);
 static gboolean          theme_has_icon                   (IconTheme        *theme,
                                                            const gchar      *icon_name);
@@ -1215,7 +1215,7 @@ pixbuf_supports_svg (void)
 {
   GSList *formats;
   GSList *tmp_list;
-  static gint found_svg = -1;
+  static int found_svg = -1;
 
   if (found_svg != -1)
     return found_svg;
@@ -1745,7 +1745,7 @@ static void
 insert_theme (GtkIconTheme *self,
               const gchar  *theme_name)
 {
-  gint i;
+  int i;
   GList *l;
   gchar **dirs;
   gchar **scaled_dirs;
@@ -1963,7 +1963,7 @@ static void
 load_themes (GtkIconTheme *self)
 {
   GDir *gdir;
-  gint base;
+  int base;
   gchar *dir;
   const gchar *file;
   GTimeVal tv;
@@ -2014,7 +2014,7 @@ load_themes (GtkIconTheme *self)
   for (j = 0; self->resource_path[j]; j++)
     {
       gchar **children;
-      gint i;
+      int i;
 
       dir = self->resource_path[j];
       children = g_resources_enumerate_children (dir, 0, NULL);
@@ -2142,8 +2142,8 @@ icon_uri_is_symbolic (const gchar *icon_name,
 static GtkIconPaintable *
 real_choose_icon (GtkIconTheme      *self,
                   const gchar       *icon_names[],
-                  gint               size,
-                  gint               scale,
+                  int                size,
+                  int                scale,
                   GtkIconLookupFlags flags,
                   gboolean           non_blocking)
 {
@@ -2152,7 +2152,7 @@ real_choose_icon (GtkIconTheme      *self,
   UnthemedIcon *unthemed_icon = NULL;
   const gchar *icon_name = NULL;
   IconTheme *theme = NULL;
-  gint i;
+  int i;
   IconKey key;
 
   if (!ensure_valid_themes (self, non_blocking))
@@ -2296,8 +2296,8 @@ icon_name_list_add_icon (GtkStrvBuilder *icons,
 static GtkIconPaintable *
 choose_icon (GtkIconTheme      *self,
              const gchar       *icon_names[],
-             gint               size,
-             gint               scale,
+             int                size,
+             int                scale,
              GtkTextDirection   direction,
              GtkIconLookupFlags flags,
              gboolean           non_blocking)
@@ -2459,8 +2459,8 @@ GtkIconPaintable *
 gtk_icon_theme_lookup_icon (GtkIconTheme       *self,
                             const char         *icon_name,
                             const char         *fallbacks[],
-                            gint                size,
-                            gint                scale,
+                            int                 size,
+                            int                 scale,
                             GtkTextDirection    direction,
                             GtkIconLookupFlags  flags)
 {
@@ -2609,7 +2609,7 @@ add_size (gpointer key,
           gpointer value,
           gpointer user_data)
 {
-  gint **res_p = user_data;
+  int **res_p = user_data;
 
   **res_p = GPOINTER_TO_INT (key);
 
@@ -2631,14 +2631,14 @@ add_size (gpointer key,
  * available. The array should be freed with g_free() when it is no
  * longer needed.
  */
-gint *
+int *
 gtk_icon_theme_get_icon_sizes (GtkIconTheme *self,
                                const gchar  *icon_name)
 {
   GList *l;
   int i;
   GHashTable *sizes;
-  gint *result, *r;
+  int *result, *r;
 
   g_return_val_if_fail (GTK_IS_ICON_THEME (self), NULL);
 
@@ -2670,7 +2670,7 @@ gtk_icon_theme_get_icon_sizes (GtkIconTheme *self,
         }
     }
 
-  r = result = g_new0 (gint, g_hash_table_size (sizes) + 1);
+  r = result = g_new0 (int, g_hash_table_size (sizes) + 1);
 
   g_hash_table_foreach (sizes, add_size, &r);
   g_hash_table_destroy (sizes);
@@ -2747,7 +2747,7 @@ gtk_icon_theme_get_icon_names (GtkIconTheme *self)
 static gboolean
 rescan_themes (GtkIconTheme *self)
 {
-  gint stat_res;
+  int stat_res;
   GStatBuf stat_buf;
   GTimeVal tv;
   guint i;
@@ -2840,11 +2840,11 @@ theme_dir_destroy (IconThemeDir *dir)
 
 static int
 theme_dir_size_difference (IconThemeDirSize *dir_size,
-                           gint              size,
-                           gint              scale)
+                           int               size,
+                           int               scale)
 {
-  gint scaled_size, scaled_dir_size;
-  gint min, max;
+  int scaled_size, scaled_dir_size;
+  int min, max;
 
   scaled_size = size * scale;
   scaled_dir_size = dir_size->size * dir_size->scale;
@@ -2942,13 +2942,13 @@ best_suffix (IconCacheFlag suffix,
 
 /* returns TRUE if dir_a is a better match */
 static gboolean
-compare_dir_size_matches (IconThemeDirSize *dir_a, gint difference_a,
-                          IconThemeDirSize *dir_b, gint difference_b,
-                          gint requested_size,
-                          gint requested_scale)
+compare_dir_size_matches (IconThemeDirSize *dir_a, int difference_a,
+                          IconThemeDirSize *dir_b, int difference_b,
+                          int requested_size,
+                          int requested_scale)
 {
-  gint diff_a;
-  gint diff_b;
+  int diff_a;
+  int diff_b;
 
   if (difference_a == 0)
     {
@@ -3008,13 +3008,13 @@ compare_dir_size_matches (IconThemeDirSize *dir_a, gint difference_a,
 static GtkIconPaintable *
 theme_lookup_icon (IconTheme   *theme,
                    const gchar *icon_name, /* interned */
-                   gint         size,
-                   gint         scale,
+                   int          size,
+                   int          scale,
                    gboolean     allow_svg)
 {
   IconThemeDirSize *min_dir_size;
   IconThemeFile *min_file;
-  gint min_difference;
+  int min_difference;
   IconCacheFlag min_suffix;
   int i;
 
@@ -3033,7 +3033,7 @@ theme_lookup_icon (IconTheme   *theme,
       IconThemeDirSize *dir_size = &g_array_index (theme->dir_sizes, IconThemeDirSize, i);
       IconThemeFile *file;
       guint best_suffix;
-      gint difference;
+      int difference;
       gpointer file_index;
 
       if (!g_hash_table_lookup_extended (dir_size->icon_hash, icon_name, NULL, &file_index))
@@ -3192,11 +3192,11 @@ theme_dir_size_equal (IconThemeDirSize *a,
 static guint32
 theme_ensure_dir_size (IconTheme *theme,
                        IconThemeDirType type,
-                       gint size,
-                       gint min_size,
-                       gint max_size,
-                       gint threshold,
-                       gint scale)
+                       int size,
+                       int min_size,
+                       int max_size,
+                       int threshold,
+                       int scale)
 {
   guint32 index;
   IconThemeDirSize new = { 0 };
@@ -3297,14 +3297,14 @@ theme_subdir_load (GtkIconTheme *self,
 {
   gchar *type_string;
   IconThemeDirType type;
-  gint size;
-  gint min_size;
-  gint max_size;
-  gint threshold;
+  int size;
+  int min_size;
+  int max_size;
+  int threshold;
   GError *error = NULL;
   guint32 dir_size_index;
   IconThemeDirSize *dir_size;
-  gint scale;
+  int scale;
   guint i;
 
   size = g_key_file_get_integer (theme_file, subdir, "Size", &error);
@@ -3717,7 +3717,7 @@ icon_ensure_texture__locked (GtkIconPaintable *icon,
 {
   GdkPixbuf *source_pixbuf;
   gint64 before;
-  gint pixel_size;
+  int pixel_size;
   GError *load_error = NULL;
 
   icon_cache_mark_used_if_cached (icon);
@@ -4018,8 +4018,8 @@ icon_paintable_init (GdkPaintableInterface *iface)
  */
 GtkIconPaintable *
 gtk_icon_paintable_new_for_file (GFile *file,
-                                 gint   size,
-                                 gint   scale)
+                                 int    size,
+                                 int    scale)
 {
   GtkIconPaintable *icon;
 
@@ -4052,7 +4052,7 @@ gtk_icon_paintable_new_for_pixbuf (GtkIconTheme *icon_theme,
                                    int           scale)
 {
   GtkIconPaintable *icon;
-  gint width, height;
+  int width, height;
 
   if (size <= 0)
     {
@@ -4086,8 +4086,8 @@ gtk_icon_paintable_new_for_pixbuf (GtkIconTheme *icon_theme,
 GtkIconPaintable *
 gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *self,
                                 GIcon              *gicon,
-                                gint                size,
-                                gint                scale,
+                                int                 size,
+                                int                 scale,
                                 GtkTextDirection    direction,
                                 GtkIconLookupFlags  flags)
 {
index d40a09082733ea0c68e65a9b112065526f753e14..3150230e001c21a7dfac579eee366413f001eb4d 100644 (file)
@@ -114,27 +114,27 @@ GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_theme_has_icon             (GtkIconTheme                *self,
                                                       const gchar                 *icon_name);
 GDK_AVAILABLE_IN_ALL
-gint             *gtk_icon_theme_get_icon_sizes      (GtkIconTheme                *self,
+int              *gtk_icon_theme_get_icon_sizes      (GtkIconTheme                *self,
                                                       const gchar                 *icon_name);
 GDK_AVAILABLE_IN_ALL
 GtkIconPaintable *gtk_icon_theme_lookup_icon         (GtkIconTheme                *self,
                                                       const char                  *icon_name,
                                                       const char                  *fallbacks[],
-                                                      gint                         size,
-                                                      gint                         scale,
+                                                      int                          size,
+                                                      int                          scale,
                                                       GtkTextDirection             direction,
                                                       GtkIconLookupFlags           flags);
 GDK_AVAILABLE_IN_ALL
 GtkIconPaintable *gtk_icon_theme_lookup_by_gicon     (GtkIconTheme                *self,
                                                       GIcon                       *icon,
-                                                      gint                         size,
-                                                      gint                         scale,
+                                                      int                          size,
+                                                      int                          scale,
                                                       GtkTextDirection             direction,
                                                       GtkIconLookupFlags           flags);
 GDK_AVAILABLE_IN_ALL
 GtkIconPaintable *gtk_icon_paintable_new_for_file    (GFile                       *file,
-                                                      gint                         size,
-                                                      gint                         scale);
+                                                      int                          size,
+                                                      int                          scale);
 GDK_AVAILABLE_IN_ALL
 char **               gtk_icon_theme_get_icon_names  (GtkIconTheme                *self);
 
index ea63186622d859213318ac26968634d1cc8b37c3..12c789719f54999abc042445799be9616e59e28d 100644 (file)
@@ -202,8 +202,8 @@ static void                 gtk_icon_view_layout                         (GtkIco
 static void                 gtk_icon_view_snapshot_item                  (GtkIconView            *icon_view,
                                                                          GtkSnapshot            *snapshot,
                                                                          GtkIconViewItem        *item,
-                                                                         gint                    x,
-                                                                         gint                    y,
+                                                                         int                     x,
+                                                                         int                     y,
                                                                          gboolean                draw_focus);
 static void                 gtk_icon_view_snapshot_rubberband            (GtkIconView            *icon_view,
                                                                          GtkSnapshot            *snapshot);
@@ -213,16 +213,16 @@ static void                 gtk_icon_view_queue_draw_item                (GtkIco
                                                                          GtkIconViewItem        *item);
 static void                 gtk_icon_view_start_rubberbanding            (GtkIconView            *icon_view,
                                                                           GdkDevice              *device,
-                                                                         gint                    x,
-                                                                         gint                    y);
+                                                                         int                     x,
+                                                                         int                     y);
 static void                 gtk_icon_view_stop_rubberbanding             (GtkIconView            *icon_view);
 static void                 gtk_icon_view_update_rubberband_selection    (GtkIconView            *icon_view);
 static gboolean             gtk_icon_view_item_hit_test                  (GtkIconView            *icon_view,
                                                                          GtkIconViewItem        *item,
-                                                                         gint                    x,
-                                                                         gint                    y,
-                                                                         gint                    width,
-                                                                         gint                    height);
+                                                                         int                     x,
+                                                                         int                     y,
+                                                                         int                     width,
+                                                                         int                     height);
 static gboolean             gtk_icon_view_unselect_all_internal          (GtkIconView            *icon_view);
 static void                 gtk_icon_view_update_rubberband              (GtkIconView            *icon_view);
 static void                 gtk_icon_view_item_invalidate_size           (GtkIconViewItem        *item);
@@ -231,20 +231,20 @@ static void                 gtk_icon_view_add_move_binding               (GtkWid
                                                                          guint                   keyval,
                                                                          guint                   modmask,
                                                                          GtkMovementStep         step,
-                                                                         gint                    count);
+                                                                         int                     count);
 static gboolean             gtk_icon_view_real_move_cursor               (GtkIconView            *icon_view,
                                                                          GtkMovementStep         step,
-                                                                         gint                    count,
+                                                                         int                     count,
                                                                           gboolean                extend,
                                                                           gboolean                modify);
 static void                 gtk_icon_view_move_cursor_up_down            (GtkIconView            *icon_view,
-                                                                         gint                    count);
+                                                                         int                     count);
 static void                 gtk_icon_view_move_cursor_page_up_down       (GtkIconView            *icon_view,
-                                                                         gint                    count);
+                                                                         int                     count);
 static void                 gtk_icon_view_move_cursor_left_right         (GtkIconView            *icon_view,
-                                                                         gint                    count);
+                                                                         int                     count);
 static void                 gtk_icon_view_move_cursor_start_end          (GtkIconView            *icon_view,
-                                                                         gint                    count);
+                                                                         int                     count);
 static void                 gtk_icon_view_scroll_to_item                 (GtkIconView            *icon_view,
                                                                          GtkIconViewItem        *item);
 static gboolean             gtk_icon_view_select_all_between             (GtkIconView            *icon_view,
@@ -1251,7 +1251,7 @@ gtk_icon_view_get_property (GObject      *object,
 
 /* GtkWidget methods */
 
-static gint
+static int
 gtk_icon_view_get_n_items (GtkIconView *icon_view)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
@@ -1267,7 +1267,7 @@ adjust_wrap_width (GtkIconView *icon_view)
 {
   if (icon_view->priv->text_cell)
     {
-      gint pixbuf_width, wrap_width;
+      int pixbuf_width, wrap_width;
 
       if (icon_view->priv->items && icon_view->priv->pixbuf_cell)
         {
@@ -1341,9 +1341,9 @@ static void
 cell_area_get_preferred_size (GtkIconView        *icon_view,
                               GtkCellAreaContext *context,
                               GtkOrientation      orientation,
-                              gint                for_size,
-                              gint               *minimum,
-                              gint               *natural)
+                              int                 for_size,
+                              int                *minimum,
+                              int                *natural)
 {
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
@@ -1384,9 +1384,9 @@ gtk_icon_view_is_empty (GtkIconView *icon_view)
 static void
 gtk_icon_view_get_preferred_item_size (GtkIconView    *icon_view,
                                        GtkOrientation  orientation,
-                                       gint            for_size,
-                                       gint           *minimum,
-                                       gint           *natural)
+                                       int             for_size,
+                                       int            *minimum,
+                                       int            *natural)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
   GtkCellAreaContext *context;
@@ -1460,11 +1460,11 @@ gtk_icon_view_get_preferred_item_size (GtkIconView    *icon_view,
 static void
 gtk_icon_view_compute_n_items_for_size (GtkIconView    *icon_view,
                                         GtkOrientation  orientation,
-                                        gint            size,
-                                        gint           *min_items,
-                                        gint           *min_item_size,
-                                        gint           *max_items,
-                                        gint           *max_item_size)
+                                        int             size,
+                                        int            *min_items,
+                                        int            *min_item_size,
+                                        int            *max_items,
+                                        int            *max_item_size)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
   int minimum, natural, spacing;
@@ -1659,7 +1659,7 @@ gtk_icon_view_snapshot (GtkWidget   *widget,
   GtkIconView *icon_view;
   GList *icons;
   GtkTreePath *path;
-  gint dest_index;
+  int dest_index;
   GtkIconViewDropPosition dest_pos;
   GtkIconViewItem *dest_item = NULL;
   GtkStyleContext *context;
@@ -1784,8 +1784,8 @@ rubberband_scroll_timeout (gpointer data)
 
 static GtkIconViewItem *
 _gtk_icon_view_get_item_at_widget_coords (GtkIconView      *icon_view,
-                                          gint              x,
-                                          gint              y,
+                                          int               x,
+                                          int               y,
                                           gboolean          only_in_cell,
                                           GtkCellRenderer **cell_at_pos)
 {
@@ -1803,7 +1803,7 @@ gtk_icon_view_motion (GtkEventController *controller,
                       gpointer            user_data)
 {
   GtkIconView *icon_view;
-  gint abs_y;
+  int abs_y;
   GdkDevice *device;
 
   icon_view = GTK_ICON_VIEW (user_data);
@@ -2303,7 +2303,7 @@ gtk_icon_view_key_pressed (GtkEventControllerKey *controller,
 static void
 gtk_icon_view_update_rubberband (GtkIconView *icon_view)
 {
-  gint x, y;
+  int x, y;
 
   x = MAX (icon_view->priv->mouse_x, 0);
   y = MAX (icon_view->priv->mouse_y, 0);
@@ -2318,8 +2318,8 @@ gtk_icon_view_update_rubberband (GtkIconView *icon_view)
 static void
 gtk_icon_view_start_rubberbanding (GtkIconView  *icon_view,
                                    GdkDevice    *device,
-                                  gint          x,
-                                  gint          y)
+                                  int           x,
+                                  int           y)
 {
   GtkIconViewPrivate *priv = icon_view->priv;
   GList *items;
@@ -2371,7 +2371,7 @@ static void
 gtk_icon_view_update_rubberband_selection (GtkIconView *icon_view)
 {
   GList *items;
-  gint x, y, width, height;
+  int x, y, width, height;
   gboolean dirty = FALSE;
   
   x = MIN (icon_view->priv->rubberband_x1,
@@ -2430,10 +2430,10 @@ hit_test (GtkCellRenderer    *renderer,
 static gboolean
 gtk_icon_view_item_hit_test (GtkIconView      *icon_view,
                             GtkIconViewItem  *item,
-                            gint              x,
-                            gint              y,
-                            gint              width,
-                            gint              height)
+                            int               x,
+                            int               y,
+                            int               width,
+                            int               height)
 {
   HitTestData data = { { x, y, width, height }, FALSE };
   GtkCellAreaContext *context;
@@ -2699,7 +2699,7 @@ gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
   gtk_widget_queue_draw (GTK_WIDGET (icon_view));
 }
 
-static gint
+static int
 compare_sizes (gconstpointer p1,
               gconstpointer p2,
                gpointer      unused)
@@ -2714,9 +2714,9 @@ gtk_icon_view_layout (GtkIconView *icon_view)
   GtkIconViewPrivate *priv = icon_view->priv;
   GtkWidget *widget = GTK_WIDGET (icon_view);
   GList *items;
-  gint item_width = 0; /* this doesn't include item_padding */
-  gint n_columns, n_rows, n_items;
-  gint col, row;
+  int item_width = 0; /* this doesn't include item_padding */
+  int n_columns, n_rows, n_items;
+  int col, row;
   GtkRequestedSize *sizes;
   gboolean rtl;
   int width, height;
@@ -2855,8 +2855,8 @@ static void
 gtk_icon_view_snapshot_item (GtkIconView     *icon_view,
                              GtkSnapshot     *snapshot,
                              GtkIconViewItem *item,
-                             gint             x,
-                             gint             y,
+                             int              x,
+                             int              y,
                              gboolean         draw_focus)
 {
   GdkRectangle cell_area;
@@ -2954,7 +2954,7 @@ gtk_icon_view_queue_draw_path (GtkIconView *icon_view,
                               GtkTreePath *path)
 {
   GList *l;
-  gint index;
+  int index;
 
   index = gtk_tree_path_get_indices (path)[0];
 
@@ -3056,8 +3056,8 @@ gtk_icon_view_item_free (GtkIconViewItem *item)
 
 GtkIconViewItem *
 _gtk_icon_view_get_item_at_coords (GtkIconView          *icon_view,
-                                   gint                  x,
-                                   gint                  y,
+                                   int                   x,
+                                   int                   y,
                                    gboolean              only_in_cell,
                                    GtkCellRenderer     **cell_at_pos)
 {
@@ -3208,7 +3208,7 @@ gtk_icon_view_row_inserted (GtkTreeModel *model,
                            gpointer      data)
 {
   GtkIconView *icon_view = GTK_ICON_VIEW (data);
-  gint index;
+  int index;
   GtkIconViewItem *item;
   GList *list;
 
@@ -3250,7 +3250,7 @@ gtk_icon_view_row_deleted (GtkTreeModel *model,
                           gpointer      data)
 {
   GtkIconView *icon_view = GTK_ICON_VIEW (data);
-  gint index;
+  int index;
   GtkIconViewItem *item;
   GList *list, *next;
   gboolean emit = FALSE;
@@ -3306,7 +3306,7 @@ static void
 gtk_icon_view_rows_reordered (GtkTreeModel *model,
                              GtkTreePath  *parent,
                              GtkTreeIter  *iter,
-                             gint         *new_order,
+                             int          *new_order,
                              gpointer      data)
 {
   GtkIconView *icon_view = GTK_ICON_VIEW (data);
@@ -3314,7 +3314,7 @@ gtk_icon_view_rows_reordered (GtkTreeModel *model,
   int length;
   GList *items = NULL, *list;
   GtkIconViewItem **item_array;
-  gint *order;
+  int *order;
 
   /* ignore changes in branches */
   if (iter != NULL)
@@ -3325,7 +3325,7 @@ gtk_icon_view_rows_reordered (GtkTreeModel *model,
 
   length = gtk_tree_model_iter_n_children (model, NULL);
 
-  order = g_new (gint, length);
+  order = g_new (int, length);
   for (i = 0; i < length; i++)
     order [new_order[i]] = i;
 
@@ -3382,7 +3382,7 @@ gtk_icon_view_add_move_binding (GtkWidgetClass *widget_class,
                                guint           keyval,
                                guint           modmask,
                                GtkMovementStep step,
-                               gint            count)
+                               int             count)
 {
   
   gtk_widget_class_add_binding_signal (widget_class,
@@ -3412,7 +3412,7 @@ gtk_icon_view_add_move_binding (GtkWidgetClass *widget_class,
 static gboolean
 gtk_icon_view_real_move_cursor (GtkIconView     *icon_view,
                                GtkMovementStep  step,
-                               gint             count,
+                               int              count,
                                 gboolean         extend,
                                 gboolean         modify)
 {
@@ -3468,10 +3468,10 @@ gtk_icon_view_real_move_cursor (GtkIconView     *icon_view,
 static GtkIconViewItem *
 find_item (GtkIconView     *icon_view,
           GtkIconViewItem *current,
-          gint             row_ofs,
-          gint             col_ofs)
+          int              row_ofs,
+          int              col_ofs)
 {
-  gint row, col;
+  int row, col;
   GList *items;
   GtkIconViewItem *item;
 
@@ -3493,10 +3493,10 @@ find_item (GtkIconView     *icon_view,
 static GtkIconViewItem *
 find_item_page_up_down (GtkIconView     *icon_view,
                        GtkIconViewItem *current,
-                       gint             count)
+                       int              count)
 {
   GList *item, *next;
-  gint y, col;
+  int y, col;
   
   col = current->col;
   y = current->cell_area.y + count * gtk_adjustment_get_page_size (icon_view->priv->vadjustment);
@@ -3546,7 +3546,7 @@ gtk_icon_view_select_all_between (GtkIconView     *icon_view,
 {
   GList *items;
   GtkIconViewItem *item;
-  gint row1, row2, col1, col2;
+  int row1, row2, col1, col2;
   gboolean dirty = FALSE;
   
   if (anchor->row < cursor->row)
@@ -3593,12 +3593,12 @@ gtk_icon_view_select_all_between (GtkIconView     *icon_view,
 
 static void 
 gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
-                                  gint         count)
+                                  int          count)
 {
   GtkIconViewItem *item;
   GtkCellRenderer *cell = NULL;
   gboolean dirty = FALSE;
-  gint step;
+  int step;
   GtkDirectionType direction;
 
   if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
@@ -3690,7 +3690,7 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view,
 
 static void 
 gtk_icon_view_move_cursor_page_up_down (GtkIconView *icon_view,
-                                       gint         count)
+                                       int          count)
 {
   GtkIconViewItem *item;
   gboolean dirty = FALSE;
@@ -3745,12 +3745,12 @@ gtk_icon_view_move_cursor_page_up_down (GtkIconView *icon_view,
 
 static void 
 gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
-                                     gint         count)
+                                     int          count)
 {
   GtkIconViewItem *item;
   GtkCellRenderer *cell = NULL;
   gboolean dirty = FALSE;
-  gint step;
+  int step;
   GtkDirectionType direction;
 
   if (!gtk_widget_has_focus (GTK_WIDGET (icon_view)))
@@ -3842,7 +3842,7 @@ gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view,
 
 static void 
 gtk_icon_view_move_cursor_start_end (GtkIconView *icon_view,
-                                    gint         count)
+                                    int          count)
 {
   GtkIconViewItem *item;
   GList *list;
@@ -3952,7 +3952,7 @@ gtk_icon_view_scroll_to_path (GtkIconView *icon_view,
   if (use_align)
     {
       int width, height;
-      gint x, y;
+      int x, y;
       gfloat offset;
       GdkRectangle item_area = 
        { 
@@ -3991,7 +3991,7 @@ gtk_icon_view_scroll_to_item (GtkIconView     *icon_view,
   GtkWidget *widget = GTK_WIDGET (icon_view);
   GtkAdjustment *hadj, *vadj;
   int widget_width, widget_height;
-  gint x, y;
+  int x, y;
   GdkRectangle item_area;
 
   item_area.x = item->cell_area.x - priv->item_padding;
@@ -4148,8 +4148,8 @@ gtk_icon_view_new_with_model (GtkTreeModel *model)
  **/
 GtkTreePath *
 gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
-                              gint         x,
-                              gint         y)
+                              int          x,
+                              int          y)
 {
   GtkIconViewItem *item;
   GtkTreePath *path;
@@ -4179,8 +4179,8 @@ gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
  **/
 gboolean 
 gtk_icon_view_get_item_at_pos (GtkIconView      *icon_view,
-                              gint              x,
-                              gint              y,
+                              int               x,
+                              int               y,
                               GtkTreePath     **path,
                               GtkCellRenderer **cell)
 {
@@ -4336,8 +4336,8 @@ gtk_icon_view_set_tooltip_cell (GtkIconView     *icon_view,
  */
 gboolean
 gtk_icon_view_get_tooltip_context (GtkIconView   *icon_view,
-                                   gint          *x,
-                                   gint          *y,
+                                   int           *x,
+                                   int           *y,
                                    gboolean       keyboard_tip,
                                    GtkTreeModel **model,
                                    GtkTreePath  **path,
@@ -4379,8 +4379,8 @@ gtk_icon_view_get_tooltip_context (GtkIconView   *icon_view,
 
 static gboolean
 gtk_icon_view_set_tooltip_query_cb (GtkWidget  *widget,
-                                    gint        x,
-                                    gint        y,
+                                    int         x,
+                                    int         y,
                                     gboolean    keyboard_tip,
                                     GtkTooltip *tooltip,
                                     gpointer    data)
@@ -4433,7 +4433,7 @@ gtk_icon_view_set_tooltip_query_cb (GtkWidget  *widget,
  */
 void
 gtk_icon_view_set_tooltip_column (GtkIconView *icon_view,
-                                  gint         column)
+                                  int          column)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
 
@@ -4471,7 +4471,7 @@ gtk_icon_view_set_tooltip_column (GtkIconView *icon_view,
  * Returns: the index of the tooltip column that is currently being
  * used, or -1 if this is disabled.
  */
-gint
+int
 gtk_icon_view_get_tooltip_column (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), 0);
@@ -4498,8 +4498,8 @@ gtk_icon_view_get_visible_range (GtkIconView  *icon_view,
                                 GtkTreePath **start_path,
                                 GtkTreePath **end_path)
 {
-  gint start_index = -1;
-  gint end_index = -1;
+  int start_index = -1;
+  int end_index = -1;
   GList *icons;
 
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), FALSE);
@@ -4853,7 +4853,7 @@ update_pixbuf_cell (GtkIconView *icon_view)
  **/
 void
 gtk_icon_view_set_text_column (GtkIconView *icon_view,
-                              gint          column)
+                              int           column)
 {
   if (column == icon_view->priv->text_column)
     return;
@@ -4888,7 +4888,7 @@ gtk_icon_view_set_text_column (GtkIconView *icon_view,
  *
  * Returns: the text column, or -1 if it’s unset.
  */
-gint
+int
 gtk_icon_view_get_text_column (GtkIconView  *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -4908,7 +4908,7 @@ gtk_icon_view_get_text_column (GtkIconView  *icon_view)
  **/
 void
 gtk_icon_view_set_markup_column (GtkIconView *icon_view,
-                                gint         column)
+                                int          column)
 {
   if (column == icon_view->priv->markup_column)
     return;
@@ -4943,7 +4943,7 @@ gtk_icon_view_set_markup_column (GtkIconView *icon_view,
  *
  * Returns: the markup column, or -1 if it’s unset.
  */
-gint
+int
 gtk_icon_view_get_markup_column (GtkIconView  *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -4961,7 +4961,7 @@ gtk_icon_view_get_markup_column (GtkIconView  *icon_view)
  **/
 void
 gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
-                                gint         column)
+                                int          column)
 {
   if (column == icon_view->priv->pixbuf_column)
     return;
@@ -4997,7 +4997,7 @@ gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
  *
  * Returns: the pixbuf column, or -1 if it’s unset.
  */
-gint
+int
 gtk_icon_view_get_pixbuf_column (GtkIconView  *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5190,7 +5190,7 @@ gtk_icon_view_path_is_selected (GtkIconView *icon_view,
  *
  * Returns: The row in which the item is displayed
  */
-gint
+int
 gtk_icon_view_get_item_row (GtkIconView *icon_view,
                             GtkTreePath *path)
 {
@@ -5219,7 +5219,7 @@ gtk_icon_view_get_item_row (GtkIconView *icon_view,
  *
  * Returns: The column in which the item is displayed
  */
-gint
+int
 gtk_icon_view_get_item_column (GtkIconView *icon_view,
                                GtkTreePath *path)
 {
@@ -5321,7 +5321,7 @@ gtk_icon_view_get_item_orientation (GtkIconView *icon_view)
  */
 void 
 gtk_icon_view_set_columns (GtkIconView *icon_view,
-                          gint         columns)
+                          int          columns)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5346,7 +5346,7 @@ gtk_icon_view_set_columns (GtkIconView *icon_view,
  * 
  * Returns: the number of columns, or -1
  */
-gint
+int
 gtk_icon_view_get_columns (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5365,7 +5365,7 @@ gtk_icon_view_get_columns (GtkIconView *icon_view)
  */
 void 
 gtk_icon_view_set_item_width (GtkIconView *icon_view,
-                             gint         item_width)
+                             int          item_width)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5392,7 +5392,7 @@ gtk_icon_view_set_item_width (GtkIconView *icon_view,
  * 
  * Returns: the width of a single item, or -1
  */
-gint
+int
 gtk_icon_view_get_item_width (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5412,7 +5412,7 @@ gtk_icon_view_get_item_width (GtkIconView *icon_view)
  */
 void 
 gtk_icon_view_set_spacing (GtkIconView *icon_view,
-                          gint         spacing)
+                          int          spacing)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5437,7 +5437,7 @@ gtk_icon_view_set_spacing (GtkIconView *icon_view,
  * 
  * Returns: the space between cells 
  */
-gint
+int
 gtk_icon_view_get_spacing (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5455,7 +5455,7 @@ gtk_icon_view_get_spacing (GtkIconView *icon_view)
  */
 void 
 gtk_icon_view_set_row_spacing (GtkIconView *icon_view,
-                              gint         row_spacing)
+                              int          row_spacing)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5480,7 +5480,7 @@ gtk_icon_view_set_row_spacing (GtkIconView *icon_view,
  * 
  * Returns: the space between rows
  */
-gint
+int
 gtk_icon_view_get_row_spacing (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5498,7 +5498,7 @@ gtk_icon_view_get_row_spacing (GtkIconView *icon_view)
  */
 void 
 gtk_icon_view_set_column_spacing (GtkIconView *icon_view,
-                                 gint         column_spacing)
+                                 int          column_spacing)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5523,7 +5523,7 @@ gtk_icon_view_set_column_spacing (GtkIconView *icon_view,
  * 
  * Returns: the space between columns
  */
-gint
+int
 gtk_icon_view_get_column_spacing (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5542,7 +5542,7 @@ gtk_icon_view_get_column_spacing (GtkIconView *icon_view)
  */
 void 
 gtk_icon_view_set_margin (GtkIconView *icon_view,
-                         gint         margin)
+                         int          margin)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5567,7 +5567,7 @@ gtk_icon_view_set_margin (GtkIconView *icon_view,
  * 
  * Returns: the space at the borders 
  */
-gint
+int
 gtk_icon_view_get_margin (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5585,7 +5585,7 @@ gtk_icon_view_get_margin (GtkIconView *icon_view)
  */
 void
 gtk_icon_view_set_item_padding (GtkIconView *icon_view,
-                               gint         item_padding)
+                               int          item_padding)
 {
   g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
   
@@ -5610,7 +5610,7 @@ gtk_icon_view_set_item_padding (GtkIconView *icon_view,
  * 
  * Returns: the padding around items
  */
-gint
+int
 gtk_icon_view_get_item_padding (GtkIconView *icon_view)
 {
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), -1);
@@ -5756,8 +5756,8 @@ remove_scroll_timeout (GtkIconView *icon_view)
 static void
 gtk_icon_view_autoscroll (GtkIconView *icon_view)
 {
-  gint px, py, width, height;
-  gint hoffset, voffset;
+  int px, py, width, height;
+  int hoffset, voffset;
 
   px = icon_view->priv->event_last_x;
   py = icon_view->priv->event_last_y;
@@ -5794,8 +5794,8 @@ drag_scroll_timeout (gpointer data)
 static gboolean
 set_destination (GtkIconView        *icon_view,
                 GtkDropTargetAsync *dest,
-                gint                x,
-                gint                y,
+                int                 x,
+                int                 y,
                 GdkDragAction      *suggested_action,
                 GType              *target)
 {
@@ -5834,7 +5834,7 @@ set_destination (GtkIconView        *icon_view,
 
   if (!gtk_icon_view_get_dest_item_at_pos (icon_view, x, y, &path, &pos)) 
     {
-      gint n_children;
+      int n_children;
       GtkTreeModel *model;
       
       /* the row got dropped on empty space, let's setup a special case
@@ -6473,7 +6473,7 @@ gtk_icon_view_set_drag_dest_item (GtkIconView              *icon_view,
       && gtk_tree_path_get_depth (path) == 1
       && gtk_tree_path_get_indices (path)[0] == 0)
     {
-      gint n_children;
+      int n_children;
 
       n_children = gtk_tree_model_iter_n_children (icon_view->priv->model,
                                                    NULL);
@@ -6537,8 +6537,8 @@ gtk_icon_view_get_drag_dest_item (GtkIconView              *icon_view,
  **/
 gboolean
 gtk_icon_view_get_dest_item_at_pos (GtkIconView              *icon_view,
-                                   gint                      drag_x,
-                                   gint                      drag_y,
+                                   int                       drag_x,
+                                   int                       drag_y,
                                    GtkTreePath             **path,
                                    GtkIconViewDropPosition  *pos)
 {
@@ -6602,7 +6602,7 @@ gtk_icon_view_create_drag_icon (GtkIconView *icon_view,
   GtkSnapshot *snapshot;
   GdkPaintable *paintable;
   GList *l;
-  gint index;
+  int index;
 
   g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), NULL);
   g_return_val_if_fail (path != NULL, NULL);
index 5c2202b262626c3ad27e55e291aee0605e65ee68..3125d12ea0cf342bfc7be4322f22775dbf852bb3 100644 (file)
@@ -86,19 +86,19 @@ GDK_AVAILABLE_IN_ALL
 GtkTreeModel * gtk_icon_view_get_model         (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_text_column   (GtkIconView    *icon_view,
-                                                gint            column);
+                                                int             column);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_text_column   (GtkIconView    *icon_view);
+int            gtk_icon_view_get_text_column   (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_markup_column (GtkIconView    *icon_view,
-                                                gint            column);
+                                                int             column);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_markup_column (GtkIconView    *icon_view);
+int            gtk_icon_view_get_markup_column (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_pixbuf_column (GtkIconView    *icon_view,
-                                                gint            column);
+                                                int             column);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_pixbuf_column (GtkIconView    *icon_view);
+int            gtk_icon_view_get_pixbuf_column (GtkIconView    *icon_view);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_item_orientation (GtkIconView    *icon_view,
@@ -107,48 +107,48 @@ GDK_AVAILABLE_IN_ALL
 GtkOrientation gtk_icon_view_get_item_orientation (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_columns       (GtkIconView    *icon_view,
-                                                gint            columns);
+                                                int             columns);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_columns       (GtkIconView    *icon_view);
+int            gtk_icon_view_get_columns       (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_item_width    (GtkIconView    *icon_view,
-                                                gint            item_width);
+                                                int             item_width);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_item_width    (GtkIconView    *icon_view);
+int            gtk_icon_view_get_item_width    (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_spacing       (GtkIconView    *icon_view,
-                                                gint            spacing);
+                                                int             spacing);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_spacing       (GtkIconView    *icon_view);
+int            gtk_icon_view_get_spacing       (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_row_spacing   (GtkIconView    *icon_view,
-                                                gint            row_spacing);
+                                                int             row_spacing);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_row_spacing   (GtkIconView    *icon_view);
+int            gtk_icon_view_get_row_spacing   (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_column_spacing (GtkIconView    *icon_view,
-                                                gint            column_spacing);
+                                                int             column_spacing);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_column_spacing (GtkIconView    *icon_view);
+int            gtk_icon_view_get_column_spacing (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_margin        (GtkIconView    *icon_view,
-                                                gint            margin);
+                                                int             margin);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_margin        (GtkIconView    *icon_view);
+int            gtk_icon_view_get_margin        (GtkIconView    *icon_view);
 GDK_AVAILABLE_IN_ALL
 void           gtk_icon_view_set_item_padding  (GtkIconView    *icon_view,
-                                                gint            item_padding);
+                                                int             item_padding);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_icon_view_get_item_padding  (GtkIconView    *icon_view);
+int            gtk_icon_view_get_item_padding  (GtkIconView    *icon_view);
 
 GDK_AVAILABLE_IN_ALL
 GtkTreePath *  gtk_icon_view_get_path_at_pos   (GtkIconView     *icon_view,
-                                                gint             x,
-                                                gint             y);
+                                                int              x,
+                                                int              y);
 GDK_AVAILABLE_IN_ALL
 gboolean       gtk_icon_view_get_item_at_pos   (GtkIconView     *icon_view,
-                                                gint              x,
-                                                gint              y,
+                                                int               x,
+                                                int               y,
                                                 GtkTreePath     **path,
                                                 GtkCellRenderer **cell);
 GDK_AVAILABLE_IN_ALL
@@ -180,10 +180,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean         gtk_icon_view_path_is_selected   (GtkIconView            *icon_view,
                                                    GtkTreePath            *path);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_icon_view_get_item_row       (GtkIconView            *icon_view,
+int              gtk_icon_view_get_item_row       (GtkIconView            *icon_view,
                                                    GtkTreePath            *path);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_icon_view_get_item_column    (GtkIconView            *icon_view,
+int              gtk_icon_view_get_item_column    (GtkIconView            *icon_view,
                                                    GtkTreePath            *path);
 GDK_AVAILABLE_IN_ALL
 GList           *gtk_icon_view_get_selected_items (GtkIconView            *icon_view);
@@ -242,8 +242,8 @@ void                   gtk_icon_view_get_drag_dest_item       (GtkIconView
                                                                GtkIconViewDropPosition  *pos);
 GDK_AVAILABLE_IN_ALL
 gboolean               gtk_icon_view_get_dest_item_at_pos     (GtkIconView              *icon_view,
-                                                               gint                      drag_x,
-                                                               gint                      drag_y,
+                                                               int                       drag_x,
+                                                               int                       drag_y,
                                                                GtkTreePath             **path,
                                                                GtkIconViewDropPosition  *pos);
 GDK_AVAILABLE_IN_ALL
@@ -268,17 +268,17 @@ void    gtk_icon_view_set_tooltip_cell                        (GtkIconView     *
                                                                GtkCellRenderer *cell);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_icon_view_get_tooltip_context                    (GtkIconView       *icon_view,
-                                                               gint              *x,
-                                                               gint              *y,
+                                                               int               *x,
+                                                               int               *y,
                                                                gboolean           keyboard_tip,
                                                                GtkTreeModel     **model,
                                                                GtkTreePath      **path,
                                                                GtkTreeIter       *iter);
 GDK_AVAILABLE_IN_ALL
 void     gtk_icon_view_set_tooltip_column                     (GtkIconView       *icon_view,
-                                                               gint               column);
+                                                               int                column);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_icon_view_get_tooltip_column                     (GtkIconView       *icon_view);
+int      gtk_icon_view_get_tooltip_column                     (GtkIconView       *icon_view);
 
 
 G_END_DECLS
index 9a12907c644f6a892bae123363700fc00ffeb307..f059b4223eb36f5448b123e318472a6714cde1a7 100644 (file)
@@ -30,9 +30,9 @@ struct _GtkIconViewItem
 {
   GdkRectangle cell_area;
 
-  gint index;
+  int index;
 
-  gint row, col;
+  int row, col;
 
   guint selected : 1;
   guint selected_before_rubberbanding : 1;
@@ -63,7 +63,7 @@ struct _GtkIconViewClass
   void    (* toggle_cursor_item)     (GtkIconView      *icon_view);
   gboolean (* move_cursor)           (GtkIconView      *icon_view,
                                       GtkMovementStep   step,
-                                      gint              count,
+                                      int               count,
                                       gboolean          extend,
                                       gboolean          modify);
   gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
@@ -80,7 +80,7 @@ struct _GtkIconViewPrivate
 
   GPtrArray          *row_contexts;
 
-  gint width, height;
+  int width, height;
   double mouse_x;
   double mouse_y;
 
@@ -97,14 +97,14 @@ struct _GtkIconViewPrivate
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
 
-  gint rubberband_x1, rubberband_y1;
-  gint rubberband_x2, rubberband_y2;
+  int rubberband_x1, rubberband_y1;
+  int rubberband_x2, rubberband_y2;
   GdkDevice *rubberband_device;
   GtkCssNode *rubberband_node;
 
   guint scroll_timeout_id;
-  gint scroll_value_diff;
-  gint event_last_x, event_last_y;
+  int scroll_value_diff;
+  int event_last_x, event_last_y;
 
   GtkIconViewItem *anchor_item;
   GtkIconViewItem *cursor_item;
@@ -114,27 +114,27 @@ struct _GtkIconViewPrivate
 
   GtkOrientation item_orientation;
 
-  gint columns;
-  gint item_width;
-  gint spacing;
-  gint row_spacing;
-  gint column_spacing;
-  gint margin;
-  gint item_padding;
+  int columns;
+  int item_width;
+  int spacing;
+  int row_spacing;
+  int column_spacing;
+  int margin;
+  int item_padding;
 
-  gint text_column;
-  gint markup_column;
-  gint pixbuf_column;
-  gint tooltip_column;
+  int text_column;
+  int markup_column;
+  int pixbuf_column;
+  int tooltip_column;
 
   GtkCellRenderer *pixbuf_cell;
   GtkCellRenderer *text_cell;
 
   /* Drag-and-drop. */
   GdkModifierType start_button_mask;
-  gint pressed_button;
-  gint press_start_x;
-  gint press_start_y;
+  int pressed_button;
+  int press_start_x;
+  int press_start_y;
 
   GdkContentFormats *source_formats;
   GtkDropTargetAsync *dest;
@@ -181,8 +181,8 @@ void                 _gtk_icon_view_set_cursor_item                (GtkIconView
                                                                     GtkIconViewItem        *item,
                                                                     GtkCellRenderer        *cursor_cell);
 GtkIconViewItem *    _gtk_icon_view_get_item_at_coords             (GtkIconView            *icon_view,
-                                                                    gint                    x,
-                                                                    gint                    y,
+                                                                    int                     x,
+                                                                    int                     y,
                                                                     gboolean                only_in_cell,
                                                                     GtkCellRenderer       **cell_at_pos);
 void                 _gtk_icon_view_select_item                    (GtkIconView            *icon_view,
index 3a0399e9396020dc4bb4bc11a0c1e06380315e8e..f4866cf3ba54df059499fd04dd5d085ea0d01b11 100644 (file)
@@ -552,17 +552,17 @@ gtk_image_new_from_gicon (GIcon *icon)
 
 typedef struct {
   GtkImage *image;
-  gint scale_factor;
+  int scale_factor;
 } LoaderData;
 
 static void
 on_loader_size_prepared (GdkPixbufLoader *loader,
-                        gint             width,
-                        gint             height,
+                        int              width,
+                        int              height,
                         gpointer         user_data)
 {
   LoaderData *loader_data = user_data;
-  gint scale_factor;
+  int scale_factor;
   GdkPixbufFormat *format;
 
   /* Let the regular icon helper code path handle non-scalable images */
@@ -582,7 +582,7 @@ static GdkPixbufAnimation *
 load_scalable_with_loader (GtkImage    *image,
                           const gchar *file_path,
                           const gchar *resource_path,
-                          gint        *scale_factor_out)
+                          int         *scale_factor_out)
 {
   GdkPixbufLoader *loader;
   GBytes *bytes;
@@ -652,7 +652,7 @@ gtk_image_set_from_file   (GtkImage    *image,
                            const gchar *filename)
 {
   GdkPixbufAnimation *anim;
-  gint scale_factor;
+  int scale_factor;
   GdkTexture *texture;
   GdkPaintable *scaler;
 
@@ -734,7 +734,7 @@ gtk_image_set_from_resource (GtkImage    *image,
                             const gchar *resource_path)
 {
   GdkPixbufAnimation *animation;
-  gint scale_factor = 1;
+  int scale_factor = 1;
   GdkTexture *texture;
   GdkPaintable *scaler;
 
@@ -1288,7 +1288,7 @@ gtk_image_system_setting_changed (GtkWidget        *widget,
  */
 void 
 gtk_image_set_pixel_size (GtkImage *image,
-                         gint      pixel_size)
+                         int       pixel_size)
 {
   g_return_if_fail (GTK_IS_IMAGE (image));
 
@@ -1308,7 +1308,7 @@ gtk_image_set_pixel_size (GtkImage *image,
  *
  * Returns: the pixel size used for named icons.
  */
-gint
+int
 gtk_image_get_pixel_size (GtkImage *image)
 {
   g_return_val_if_fail (GTK_IS_IMAGE (image), -1);
index 722d40c0bc7236d3826bdf66bd00b75579bbbab8..4f4e38aa31d1fe5dac038d6fec760475a019090d 100644 (file)
@@ -108,7 +108,7 @@ void gtk_image_set_from_gicon     (GtkImage        *image,
                                   GIcon           *icon);
 GDK_AVAILABLE_IN_ALL
 void gtk_image_set_pixel_size     (GtkImage        *image,
-                                  gint             pixel_size);
+                                  int              pixel_size);
 GDK_AVAILABLE_IN_ALL
 void gtk_image_set_icon_size      (GtkImage        *image,
                                    GtkIconSize      icon_size);
@@ -124,7 +124,7 @@ const char *gtk_image_get_icon_name (GtkImage     *image);
 GDK_AVAILABLE_IN_ALL
 GIcon *    gtk_image_get_gicon     (GtkImage              *image);
 GDK_AVAILABLE_IN_ALL
-gint       gtk_image_get_pixel_size (GtkImage             *image);
+int        gtk_image_get_pixel_size (GtkImage             *image);
 GDK_AVAILABLE_IN_ALL
 GtkIconSize gtk_image_get_icon_size (GtkImage             *image);
 
index 5c2d6171648f83f7deccfaf43060d162762365e7..80f9c68f2fc7f91c0bd30b46afee5d9386c9900e 100644 (file)
@@ -26,26 +26,26 @@ typedef struct _GtkImageDefinitionPaintable GtkImageDefinitionPaintable;
 
 struct _GtkImageDefinitionEmpty {
   GtkImageType type;
-  gint ref_count;
+  int ref_count;
 };
 
 struct _GtkImageDefinitionIconName {
   GtkImageType type;
-  gint ref_count;
+  int ref_count;
 
   char *icon_name;
 };
 
 struct _GtkImageDefinitionGIcon {
   GtkImageType type;
-  gint ref_count;
+  int ref_count;
 
   GIcon *gicon;
 };
 
 struct _GtkImageDefinitionPaintable {
   GtkImageType type;
-  gint ref_count;
+  int ref_count;
 
   GdkPaintable *paintable;
 };
@@ -171,7 +171,7 @@ gtk_image_definition_get_storage_type (const GtkImageDefinition *def)
   return def->type;
 }
 
-gint
+int
 gtk_image_definition_get_scale (const GtkImageDefinition *def)
 {
   switch (def->type)
index fc77fe15948fcad8e76da9fdb109fc19799f428e..6471901f1ae76e5b609f0207c6fa39b78c8a6432 100644 (file)
@@ -34,7 +34,7 @@ GtkImageDefinition *    gtk_image_definition_ref                (GtkImageDefinit
 void                    gtk_image_definition_unref              (GtkImageDefinition             *def);
 
 GtkImageType            gtk_image_definition_get_storage_type   (const GtkImageDefinition       *def);
-gint                    gtk_image_definition_get_scale          (const GtkImageDefinition       *def);
+int                     gtk_image_definition_get_scale          (const GtkImageDefinition       *def);
 const gchar *           gtk_image_definition_get_icon_name      (const GtkImageDefinition       *def);
 GIcon *                 gtk_image_definition_get_gicon          (const GtkImageDefinition       *def);
 GdkPaintable *          gtk_image_definition_get_paintable      (const GtkImageDefinition       *def);
index 0ccca3bb037edd08112a6b04ae358c1ebda01625..a7b419435bf1718ad0031522a740f60b1ebacdf7 100644 (file)
@@ -125,16 +125,16 @@ struct _GtkIMContextPrivate {
 static void     gtk_im_context_real_get_preedit_string (GtkIMContext   *context,
                                                        gchar         **str,
                                                        PangoAttrList **attrs,
-                                                       gint           *cursor_pos);
+                                                       int            *cursor_pos);
 static gboolean gtk_im_context_real_filter_keypress    (GtkIMContext   *context,
                                                        GdkEvent       *event);
 static gboolean gtk_im_context_real_get_surrounding    (GtkIMContext   *context,
                                                        gchar         **text,
-                                                       gint           *cursor_index);
+                                                       int            *cursor_index);
 static void     gtk_im_context_real_set_surrounding    (GtkIMContext   *context,
                                                        const char     *text,
-                                                       gint            len,
-                                                       gint            cursor_index);
+                                                       int             len,
+                                                       int             cursor_index);
 
 static void     gtk_im_context_get_property            (GObject        *obj,
                                                         guint           property_id,
@@ -360,7 +360,7 @@ static void
 gtk_im_context_real_get_preedit_string (GtkIMContext       *context,
                                        gchar             **str,
                                        PangoAttrList     **attrs,
-                                       gint               *cursor_pos)
+                                       int                *cursor_pos)
 {
   if (str)
     *str = g_strdup ("");
@@ -380,14 +380,14 @@ gtk_im_context_real_filter_keypress (GtkIMContext *context,
 typedef struct
 {
   gchar *text;
-  gint cursor_index;
+  int cursor_index;
 } SurroundingInfo;
 
 static void
 gtk_im_context_real_set_surrounding (GtkIMContext  *context,
                                     const gchar   *text,
-                                    gint           len,
-                                    gint           cursor_index)
+                                    int            len,
+                                    int            cursor_index)
 {
   SurroundingInfo *info = g_object_get_data (G_OBJECT (context),
                                              "gtk-im-surrounding-info");
@@ -403,7 +403,7 @@ gtk_im_context_real_set_surrounding (GtkIMContext  *context,
 static gboolean
 gtk_im_context_real_get_surrounding (GtkIMContext *context,
                                     gchar       **text,
-                                    gint         *cursor_index)
+                                    int          *cursor_index)
 {
   gboolean result;
   gboolean info_is_local = FALSE;
@@ -486,7 +486,7 @@ void
 gtk_im_context_get_preedit_string (GtkIMContext   *context,
                                   gchar         **str,
                                   PangoAttrList **attrs,
-                                  gint           *cursor_pos)
+                                  int            *cursor_pos)
 {
   GtkIMContextClass *klass;
   
@@ -743,8 +743,8 @@ gtk_im_context_set_use_preedit (GtkIMContext *context,
 void
 gtk_im_context_set_surrounding (GtkIMContext  *context,
                                const gchar   *text,
-                               gint           len,
-                               gint           cursor_index)
+                               int            len,
+                               int            cursor_index)
 {
   GtkIMContextClass *klass;
   
@@ -792,11 +792,11 @@ gtk_im_context_set_surrounding (GtkIMContext  *context,
 gboolean
 gtk_im_context_get_surrounding (GtkIMContext *context,
                                gchar       **text,
-                               gint         *cursor_index)
+                               int          *cursor_index)
 {
   GtkIMContextClass *klass;
   gchar *local_text = NULL;
-  gint local_index;
+  int local_index;
   gboolean result = FALSE;
   
   g_return_val_if_fail (GTK_IS_IM_CONTEXT (context), FALSE);
@@ -841,8 +841,8 @@ gtk_im_context_get_surrounding (GtkIMContext *context,
  **/
 gboolean
 gtk_im_context_delete_surrounding (GtkIMContext *context,
-                                  gint          offset,
-                                  gint          n_chars)
+                                  int           offset,
+                                  int           n_chars)
 {
   gboolean result;
   
index fee5cf20468e9e39acc903cdeed0b4c770edbab1..23c00f9809bb23e47d23c2ac8ebbfa59de67e259 100644 (file)
@@ -57,8 +57,8 @@ struct _GtkIMContextClass
   void     (*commit)               (GtkIMContext *context, const gchar *str);
   gboolean (*retrieve_surrounding) (GtkIMContext *context);
   gboolean (*delete_surrounding)   (GtkIMContext *context,
-                                   gint          offset,
-                                   gint          n_chars);
+                                   int           offset,
+                                   int           n_chars);
 
   /* Virtual functions */
   void     (*set_client_widget)   (GtkIMContext   *context,
@@ -66,7 +66,7 @@ struct _GtkIMContextClass
   void     (*get_preedit_string)  (GtkIMContext   *context,
                                   gchar         **str,
                                   PangoAttrList **attrs,
-                                  gint           *cursor_pos);
+                                  int            *cursor_pos);
   gboolean (*filter_keypress)     (GtkIMContext   *context,
                                   GdkEvent       *event);
   void     (*focus_in)            (GtkIMContext   *context);
@@ -78,11 +78,11 @@ struct _GtkIMContextClass
                                   gboolean        use_preedit);
   void     (*set_surrounding)     (GtkIMContext   *context,
                                   const gchar    *text,
-                                  gint            len,
-                                  gint            cursor_index);
+                                  int             len,
+                                  int             cursor_index);
   gboolean (*get_surrounding)     (GtkIMContext   *context,
                                   gchar         **text,
-                                  gint           *cursor_index);
+                                  int            *cursor_index);
   /*< private >*/
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -103,7 +103,7 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_get_preedit_string  (GtkIMContext       *context,
                                             gchar             **str,
                                             PangoAttrList     **attrs,
-                                            gint               *cursor_pos);
+                                            int                *cursor_pos);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_im_context_filter_keypress     (GtkIMContext       *context,
                                              GdkEvent           *event);
@@ -133,16 +133,16 @@ void     gtk_im_context_set_use_preedit     (GtkIMContext       *context,
 GDK_AVAILABLE_IN_ALL
 void     gtk_im_context_set_surrounding     (GtkIMContext       *context,
                                             const gchar        *text,
-                                            gint                len,
-                                            gint                cursor_index);
+                                            int                 len,
+                                            int                 cursor_index);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_im_context_get_surrounding     (GtkIMContext       *context,
                                             gchar             **text,
-                                            gint               *cursor_index);
+                                            int                *cursor_index);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_im_context_delete_surrounding  (GtkIMContext       *context,
-                                            gint                offset,
-                                            gint                n_chars);
+                                            int                 offset,
+                                            int                 n_chars);
 
 G_END_DECLS
 
index 8069632e880087f02d12065b334674a6c5eeed98..b337e5232560a89af1a782c08df7a2fb16eb79a2 100644 (file)
@@ -103,7 +103,7 @@ static void gtk_im_context_ime_reset               (GtkIMContext   *context);
 static void gtk_im_context_ime_get_preedit_string  (GtkIMContext   *context,
                                                     gchar         **str,
                                                     PangoAttrList **attrs,
-                                                    gint           *cursor_pos);
+                                                    int            *cursor_pos);
 static void gtk_im_context_ime_focus_in            (GtkIMContext   *context);
 static void gtk_im_context_ime_focus_out           (GtkIMContext   *context);
 static void gtk_im_context_ime_set_cursor_location (GtkIMContext   *context,
@@ -117,11 +117,11 @@ static void gtk_im_context_ime_set_preedit_font (GtkIMContext    *context);
 static GdkWin32MessageFilterReturn
 gtk_im_context_ime_message_filter               (GdkWin32Display *display,
                                                  MSG             *msg,
-                                                 gint            *ret_valp,
+                                                 int             *ret_valp,
                                                  gpointer         data);
 static void get_window_position                 (GdkSurface       *win,
-                                                 gint            *x,
-                                                 gint            *y);
+                                                 int             *x,
+                                                 int             *y);
 
 G_DEFINE_TYPE_WITH_CODE (GtkIMContextIME, gtk_im_context_ime, GTK_TYPE_IM_CONTEXT,
                         gtk_im_module_ensure_extension_point ();
@@ -441,12 +441,12 @@ gtk_im_context_ime_reset (GtkIMContext *context)
 
 
 static gchar *
-get_utf8_preedit_string (GtkIMContextIME *context_ime, gint *pos_ret)
+get_utf8_preedit_string (GtkIMContextIME *context_ime, int *pos_ret)
 {
   gchar *utf8str = NULL;
   HWND hwnd;
   HIMC himc;
-  gint pos = 0;
+  int pos = 0;
 
   if (pos_ret)
     *pos_ret = 0;
@@ -632,10 +632,10 @@ static void
 gtk_im_context_ime_get_preedit_string (GtkIMContext   *context,
                                        gchar         **str,
                                        PangoAttrList **attrs,
-                                       gint           *cursor_pos)
+                                       int            *cursor_pos)
 {
   gchar *utf8str = NULL;
-  gint pos = 0;
+  int pos = 0;
   GtkIMContextIME *context_ime;
 
   context_ime = GTK_IM_CONTEXT_IME (context);
@@ -799,7 +799,7 @@ static void
 gtk_im_context_ime_set_cursor_location (GtkIMContext *context,
                                         GdkRectangle *area)
 {
-  gint wx = 0, wy = 0;
+  int wx = 0, wy = 0;
   GtkIMContextIME *context_ime;
   COMPOSITIONFORM cf;
   HWND hwnd;
@@ -974,7 +974,7 @@ ERROR_OUT:
 static GdkWin32MessageFilterReturn
 gtk_im_context_ime_message_filter (GdkWin32Display *display,
                                    MSG             *msg,
-                                   gint            *ret_valp,
+                                   int             *ret_valp,
                                    gpointer         data)
 {
   GtkIMContext *context;
@@ -1006,7 +1006,7 @@ gtk_im_context_ime_message_filter (GdkWin32Display *display,
     {
     case WM_IME_COMPOSITION:
       {
-        gint wx = 0, wy = 0;
+        int wx = 0, wy = 0;
         CANDIDATEFORM cf;
 
         get_window_position (context_ime->client_surface, &wx, &wy);
@@ -1111,7 +1111,7 @@ gtk_im_context_ime_message_filter (GdkWin32Display *display,
  * x and y must be initialized to 0.
  */
 static void
-get_window_position (GdkSurface *surface, gint *x, gint *y)
+get_window_position (GdkSurface *surface, int *x, int *y)
 {
   GdkSurface *parent, *toplevel;
 
index c56c998ea7d54c4da542154564a2f21eea297ed3..4717c1df9dd1e3ebd28c06e340c48b77b1b14340 100644 (file)
@@ -61,7 +61,7 @@ static void
 quartz_get_preedit_string (GtkIMContext *context,
                            gchar **str,
                            PangoAttrList **attrs,
-                           gint *cursor_pos)
+                           int *cursor_pos)
 {
   GtkIMContextQuartz *qc = GTK_IM_CONTEXT_QUARTZ (context);
 
@@ -288,7 +288,7 @@ static void
 quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
 {
   GtkIMContextQuartz *qc = GTK_IM_CONTEXT_QUARTZ (context);
-  gint x, y;
+  int x, y;
   NSView *nsview;
   GdkSurface *surface;
 
index 17e8f6850573b2682feaf198c20cb6066648bd77..c3681715ee724d6693bbed5ef9b38ad94c9ada6f 100644 (file)
@@ -63,7 +63,7 @@ struct _GtkIMContextSimplePrivate
 {
   guint16        compose_buffer[GTK_MAX_COMPOSE_LEN + 1];
   gunichar       tentative_match;
-  gint           tentative_match_len;
+  int            tentative_match_len;
 
   guint          in_hex_sequence : 1;
   guint          modifiers_dropped : 1;
@@ -110,7 +110,7 @@ static void     gtk_im_context_simple_reset              (GtkIMContext
 static void     gtk_im_context_simple_get_preedit_string (GtkIMContext             *context,
                                                          gchar                   **str,
                                                          PangoAttrList           **attrs,
-                                                         gint                     *cursor_pos);
+                                                         int                      *cursor_pos);
 
 static void init_compose_table_async (GCancellable         *cancellable,
                                       GAsyncReadyCallback   callback,
@@ -301,7 +301,7 @@ gtk_im_context_simple_commit_char (GtkIMContext *context,
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
   GtkIMContextSimplePrivate *priv = context_simple->priv;
   gchar buf[10];
-  gint len;
+  int len;
 
   g_return_if_fail (g_unichar_validate (ch));
 
@@ -357,10 +357,10 @@ compare_seq (const void *key, const void *value)
 static gboolean
 check_table (GtkIMContextSimple    *context_simple,
             const GtkComposeTable *table,
-            gint                   n_compose)
+            int                    n_compose)
 {
   GtkIMContextSimplePrivate *priv = context_simple->priv;
-  gint row_stride = table->max_seq_len + 2; 
+  int row_stride = table->max_seq_len + 2; 
   guint16 *seq; 
   
   /* Will never match, if the sequence in the compose buffer is longer
@@ -436,15 +436,15 @@ check_table (GtkIMContextSimple    *context_simple,
 gboolean
 gtk_check_compact_table (const GtkComposeTableCompact  *table,
                          guint16                       *compose_buffer,
-                         gint                           n_compose,
+                         int                            n_compose,
                          gboolean                      *compose_finish,
                          gboolean                      *compose_match,
                          gunichar                      *output_char)
 {
-  gint row_stride;
+  int row_stride;
   guint16 *seq_index;
   guint16 *seq;
-  gint i;
+  int i;
   gboolean match;
   gunichar value;
 
@@ -537,14 +537,14 @@ gtk_check_compact_table (const GtkComposeTableCompact  *table,
  * permutations of the diacritic marks, then attempt to normalize.
  */
 static gboolean
-check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
+check_normalize_nfc (gunichar* combination_buffer, int n_compose)
 {
   gunichar combination_buffer_temp[GTK_MAX_COMPOSE_LEN];
   gchar *combination_utf8_temp = NULL;
   gchar *nfc_temp = NULL;
-  gint n_combinations;
+  int n_combinations;
   gunichar temp_swap;
-  gint i;
+  int i;
 
   n_combinations = 1;
 
@@ -598,11 +598,11 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
 
 gboolean
 gtk_check_algorithmically (const guint16       *compose_buffer,
-                           gint                 n_compose,
+                           int                  n_compose,
                            gunichar            *output_char)
 
 {
-  gint i;
+  int i;
   gunichar combination_buffer[GTK_MAX_COMPOSE_LEN];
   gchar *combination_utf8, *nfc;
 
@@ -705,11 +705,11 @@ gtk_check_algorithmically (const guint16       *compose_buffer,
 
 static gboolean
 check_hex (GtkIMContextSimple *context_simple,
-           gint                n_compose)
+           int                 n_compose)
 {
   GtkIMContextSimplePrivate *priv = context_simple->priv;
   /* See if this is a hex sequence, return TRUE if so */
-  gint i;
+  int i;
   GString *str;
   gulong n;
   gchar *nptr = NULL;
@@ -778,7 +778,7 @@ beep_surface (GdkSurface *surface)
 
 static gboolean
 no_sequence_matches (GtkIMContextSimple *context_simple,
-                     gint                n_compose,
+                     int                 n_compose,
                      GdkEvent           *event)
 {
   GtkIMContextSimplePrivate *priv = context_simple->priv;
@@ -793,7 +793,7 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
    */
   if (priv->tentative_match)
     {
-      gint len = priv->tentative_match_len;
+      int len = priv->tentative_match_len;
       int i;
       
       gtk_im_context_simple_commit_char (context, priv->tentative_match);
@@ -859,8 +859,8 @@ canonical_hex_keyval (GdkEvent *event)
 {
   guint keyval, event_keyval;
   guint *keyvals = NULL;
-  gint n_vals = 0;
-  gint i;
+  int n_vals = 0;
+  int i;
 
   event_keyval = gdk_key_event_get_keyval (event);
 
@@ -1216,7 +1216,7 @@ static void
 gtk_im_context_simple_get_preedit_string (GtkIMContext   *context,
                                          gchar         **str,
                                          PangoAttrList **attrs,
-                                         gint           *cursor_pos)
+                                         int            *cursor_pos)
 {
   GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context);
   GtkIMContextSimplePrivate *priv = context_simple->priv;
@@ -1285,8 +1285,8 @@ gtk_im_context_simple_get_preedit_string (GtkIMContext   *context,
 void
 gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
                                 guint16            *data,
-                                gint                max_seq_len,
-                                gint                n_seqs)
+                                int                 max_seq_len,
+                                int                 n_seqs)
 {
   g_return_if_fail (GTK_IS_IM_CONTEXT_SIMPLE (context_simple));
 
index b62cf8c183d3ee274fdd60e06a960ca9bca8e13c..f03e7e56b24eae01cdad9ae3efb25c3ca92f808f 100644 (file)
@@ -67,8 +67,8 @@ GtkIMContext *gtk_im_context_simple_new       (void);
 GDK_AVAILABLE_IN_ALL
 void          gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple,
                                               guint16            *data,
-                                              gint                max_seq_len,
-                                              gint                n_seqs);
+                                              int                 max_seq_len,
+                                              int                 n_seqs);
 GDK_AVAILABLE_IN_ALL
 void          gtk_im_context_simple_add_compose_file (GtkIMContextSimple *context_simple,
                                                       const gchar        *compose_file);
index 401156a84e7cd918b48ce0e65212eeb2eb16d7d6..5b79ed2f443a5a1d501ed794ede48c0d2d036426 100644 (file)
@@ -27,11 +27,11 @@ G_BEGIN_DECLS
 extern const GtkComposeTableCompact gtk_compose_table_compact;
 
 gboolean gtk_check_algorithmically (const guint16                *compose_buffer,
-                                    gint                          n_compose,
+                                    int                           n_compose,
                                     gunichar                     *output);
 gboolean gtk_check_compact_table   (const GtkComposeTableCompact *table,
                                     guint16                      *compose_buffer,
-                                    gint                          n_compose,
+                                    int                           n_compose,
                                     gboolean                     *compose_finish,
                                     gboolean                     *compose_match,
                                     gunichar                     *output_char);
index f76f183fd2e052e475b5d3eab0c7b3361ce75f5c..d9144e30fdee9b4425e72b6e7d105003473cbadd 100644 (file)
@@ -56,8 +56,8 @@ struct _GtkIMContextWaylandClass
 
 struct preedit {
   gchar *text;
-  gint cursor_begin;
-  gint cursor_end;
+  int cursor_begin;
+  int cursor_end;
 };
 
 struct surrounding_delete {
@@ -76,8 +76,8 @@ struct _GtkIMContextWayland
 
   struct {
     gchar *text;
-    gint cursor_idx;
-    gint anchor_idx;
+    int cursor_idx;
+    int anchor_idx;
   } surrounding;
 
   enum zwp_text_input_v3_change_cause surrounding_change;
@@ -143,8 +143,8 @@ static void
 text_input_preedit (void                     *data,
                     struct zwp_text_input_v3 *text_input,
                     const char               *text,
-                    gint                      cursor_begin,
-                    gint                      cursor_end)
+                    int                       cursor_begin,
+                    int                       cursor_end)
 {
   GtkIMContextWayland *context;
   GtkIMContextWaylandGlobal *global = data;
@@ -240,7 +240,7 @@ text_input_delete_surrounding_text_apply (GtkIMContextWaylandGlobal *global,
 {
   GtkIMContextWayland *context;
   gboolean retval;
-  gint len;
+  int len;
   struct surrounding_delete defaults = {0};
 
   context = GTK_IM_CONTEXT_WAYLAND (global->current);
@@ -492,7 +492,7 @@ gtk_im_context_wayland_finalize (GObject *object)
 
 static void
 pressed_cb (GtkGestureClick     *gesture,
-            gint                 n_press,
+            int                  n_press,
             gdouble              x,
             gdouble              y,
             GtkIMContextWayland *context)
@@ -506,7 +506,7 @@ pressed_cb (GtkGestureClick     *gesture,
 
 static void
 released_cb (GtkGestureClick     *gesture,
-             gint                 n_press,
+             int                  n_press,
              gdouble              x,
              gdouble              y,
              GtkIMContextWayland *context)
@@ -572,7 +572,7 @@ static void
 gtk_im_context_wayland_get_preedit_string (GtkIMContext   *context,
                                            gchar         **str,
                                            PangoAttrList **attrs,
-                                           gint           *cursor_pos)
+                                           int            *cursor_pos)
 {
   GtkIMContextWayland *context_wayland = GTK_IM_CONTEXT_WAYLAND (context);
   const char *preedit_str;
@@ -859,8 +859,8 @@ gtk_im_context_wayland_set_use_preedit (GtkIMContext *context,
 static void
 gtk_im_context_wayland_set_surrounding (GtkIMContext *context,
                                         const gchar  *text,
-                                        gint          len,
-                                        gint          cursor_index)
+                                        int           len,
+                                        int           cursor_index)
 {
   GtkIMContextWayland *context_wayland;
 
@@ -883,7 +883,7 @@ gtk_im_context_wayland_set_surrounding (GtkIMContext *context,
 static gboolean
 gtk_im_context_wayland_get_surrounding (GtkIMContext  *context,
                                         gchar        **text,
-                                        gint          *cursor_index)
+                                        int           *cursor_index)
 {
   GtkIMContextWayland *context_wayland;
 
index b503406122e855d4dd2843b076a518dd3cb3334a..413737b6d3211a20be54b4fb6a65519bb90dde67 100644 (file)
@@ -64,7 +64,7 @@ static void     gtk_im_multicontext_set_client_widget  (GtkIMContext
 static void     gtk_im_multicontext_get_preedit_string (GtkIMContext            *context,
                                                        gchar                  **str,
                                                        PangoAttrList          **attrs,
-                                                       gint                   *cursor_pos);
+                                                       int                    *cursor_pos);
 static gboolean gtk_im_multicontext_filter_keypress    (GtkIMContext            *context,
                                                        GdkEvent                *event);
 static void     gtk_im_multicontext_focus_in           (GtkIMContext            *context);
@@ -76,11 +76,11 @@ static void     gtk_im_multicontext_set_use_preedit    (GtkIMContext
                                                        gboolean                 use_preedit);
 static gboolean gtk_im_multicontext_get_surrounding    (GtkIMContext            *context,
                                                        gchar                  **text,
-                                                       gint                    *cursor_index);
+                                                       int                     *cursor_index);
 static void     gtk_im_multicontext_set_surrounding    (GtkIMContext            *context,
                                                        const char              *text,
-                                                       gint                     len,
-                                                       gint                     cursor_index);
+                                                       int                      len,
+                                                       int                      cursor_index);
 
 static void     gtk_im_multicontext_preedit_start_cb        (GtkIMContext      *delegate,
                                                             GtkIMMulticontext *multicontext);
@@ -94,8 +94,8 @@ static void     gtk_im_multicontext_commit_cb               (GtkIMContext      *
 static gboolean gtk_im_multicontext_retrieve_surrounding_cb (GtkIMContext      *delegate,
                                                             GtkIMMulticontext *multicontext);
 static gboolean gtk_im_multicontext_delete_surrounding_cb   (GtkIMContext      *delegate,
-                                                            gint               offset,
-                                                            gint               n_chars,
+                                                            int                offset,
+                                                            int                n_chars,
                                                             GtkIMMulticontext *multicontext);
 
 static void propagate_purpose (GtkIMMulticontext *context);
@@ -331,7 +331,7 @@ static void
 gtk_im_multicontext_get_preedit_string (GtkIMContext   *context,
                                        gchar         **str,
                                        PangoAttrList **attrs,
-                                       gint           *cursor_pos)
+                                       int            *cursor_pos)
 {
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
   GtkIMContext *delegate = gtk_im_multicontext_get_delegate (multicontext);
@@ -376,7 +376,7 @@ gtk_im_multicontext_filter_keypress (GtkIMContext *context,
           ch = gdk_keyval_to_unicode (keyval);
           if (ch != 0 && !g_unichar_iscntrl (ch))
             {
-              gint len;
+              int len;
               gchar buf[10];
 
               len = g_unichar_to_utf8 (ch, buf);
@@ -462,7 +462,7 @@ gtk_im_multicontext_set_use_preedit (GtkIMContext   *context,
 static gboolean
 gtk_im_multicontext_get_surrounding (GtkIMContext  *context,
                                     gchar        **text,
-                                    gint          *cursor_index)
+                                    int           *cursor_index)
 {
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
   GtkIMContext *delegate = gtk_im_multicontext_get_delegate (multicontext);
@@ -483,8 +483,8 @@ gtk_im_multicontext_get_surrounding (GtkIMContext  *context,
 static void
 gtk_im_multicontext_set_surrounding (GtkIMContext *context,
                                     const char   *text,
-                                    gint          len,
-                                    gint          cursor_index)
+                                    int           len,
+                                    int           cursor_index)
 {
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
   GtkIMContext *delegate = gtk_im_multicontext_get_delegate (multicontext);
@@ -535,8 +535,8 @@ gtk_im_multicontext_retrieve_surrounding_cb (GtkIMContext      *delegate,
 
 static gboolean
 gtk_im_multicontext_delete_surrounding_cb (GtkIMContext      *delegate,
-                                          gint               offset,
-                                          gint               n_chars,
+                                          int                offset,
+                                          int                n_chars,
                                           GtkIMMulticontext *multicontext)
 {
   gboolean result;
index 775ba0b6daeedd9487c5a0f887d0162d6a4e555b..2ddaa3e839aa42c0f7e8ad4b4d866d28f248f65e 100644 (file)
@@ -157,7 +157,7 @@ struct _GtkInfoBarClass
 {
   GtkWidgetClass parent_class;
 
-  void (* response) (GtkInfoBar *info_bar, gint response_id);
+  void (* response) (GtkInfoBar *info_bar, int response_id);
   void (* close)    (GtkInfoBar *info_bar);
 };
 
@@ -298,7 +298,7 @@ clear_response_data (GtkWidget *widget)
 
 static GtkWidget *
 find_button (GtkInfoBar *info_bar,
-             gint        response_id)
+             int         response_id)
 {
   GtkWidget *child;
 
@@ -501,7 +501,7 @@ gtk_info_bar_buildable_interface_init (GtkBuildableIface *iface)
   iface->custom_finished = gtk_info_bar_buildable_custom_finished;
 }
 
-static gint
+static int
 get_response_for_widget (GtkInfoBar *info_bar,
                          GtkWidget  *widget)
 {
@@ -518,7 +518,7 @@ static void
 action_widget_activated (GtkWidget  *widget,
                          GtkInfoBar *info_bar)
 {
-  gint response_id;
+  int response_id;
 
   response_id = get_response_for_widget (info_bar, widget);
   gtk_info_bar_response (info_bar, response_id);
@@ -538,7 +538,7 @@ action_widget_activated (GtkWidget  *widget,
 void
 gtk_info_bar_add_action_widget (GtkInfoBar *info_bar,
                                 GtkWidget  *child,
-                                gint        response_id)
+                                int         response_id)
 {
   ResponseData *ad;
   guint signal_id;
@@ -610,7 +610,7 @@ gtk_info_bar_remove_action_widget (GtkInfoBar *info_bar,
 GtkWidget*
 gtk_info_bar_add_button (GtkInfoBar  *info_bar,
                          const gchar *button_text,
-                         gint         response_id)
+                         int          response_id)
 {
   GtkWidget *button;
 
@@ -633,7 +633,7 @@ add_buttons_valist (GtkInfoBar  *info_bar,
                     va_list      args)
 {
   const gchar* text;
-  gint response_id;
+  int response_id;
 
   g_return_if_fail (GTK_IS_INFO_BAR (info_bar));
 
@@ -641,7 +641,7 @@ add_buttons_valist (GtkInfoBar  *info_bar,
     return;
 
   text = first_button_text;
-  response_id = va_arg (args, gint);
+  response_id = va_arg (args, int);
 
   while (text != NULL)
     {
@@ -749,7 +749,7 @@ update_default_response (GtkInfoBar *info_bar,
  */
 void
 gtk_info_bar_set_response_sensitive (GtkInfoBar *info_bar,
-                                     gint        response_id,
+                                     int         response_id,
                                      gboolean    setting)
 {
   GtkWidget *child;
@@ -784,7 +784,7 @@ gtk_info_bar_set_response_sensitive (GtkInfoBar *info_bar,
  */
 void
 gtk_info_bar_set_default_response (GtkInfoBar *info_bar,
-                                   gint        response_id)
+                                   int         response_id)
 {
   GtkWidget *child;
   GtkWidget *window;
@@ -820,7 +820,7 @@ gtk_info_bar_set_default_response (GtkInfoBar *info_bar,
  */
 void
 gtk_info_bar_response (GtkInfoBar *info_bar,
-                       gint        response_id)
+                       int         response_id)
 {
   g_return_if_fail (GTK_IS_INFO_BAR (info_bar));
 
@@ -830,9 +830,9 @@ gtk_info_bar_response (GtkInfoBar *info_bar,
 typedef struct
 {
   gchar *name;
-  gint response_id;
-  gint line;
-  gint col;
+  int response_id;
+  int line;
+  int col;
 } ActionWidgetInfo;
 
 typedef struct
@@ -840,11 +840,11 @@ typedef struct
   GtkInfoBar *info_bar;
   GtkBuilder *builder;
   GSList *items;
-  gint response_id;
+  int response_id;
   gboolean is_text;
   GString *string;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } SubParserData;
 
 static void
index 834ec197b999491299d954fa9e54dca0de2a3c7c..528a1250de000735101d48fecd71dd485f7b32f0 100644 (file)
@@ -56,14 +56,14 @@ GtkWidget     *gtk_info_bar_new_with_buttons       (const gchar    *first_button
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_add_action_widget      (GtkInfoBar     *info_bar,
                                                     GtkWidget      *child,
-                                                    gint            response_id);
+                                                    int             response_id);
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_remove_action_widget   (GtkInfoBar     *info_bar,
                                                     GtkWidget      *widget);
 GDK_AVAILABLE_IN_ALL
 GtkWidget     *gtk_info_bar_add_button             (GtkInfoBar     *info_bar,
                                                     const gchar    *button_text,
-                                                    gint            response_id);
+                                                    int             response_id);
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_add_buttons            (GtkInfoBar     *info_bar,
                                                     const gchar    *first_button_text,
@@ -77,15 +77,15 @@ void           gtk_info_bar_remove_child           (GtkInfoBar     *info_bar,
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_set_response_sensitive (GtkInfoBar     *info_bar,
-                                                    gint            response_id,
+                                                    int             response_id,
                                                     gboolean        setting);
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_set_default_response   (GtkInfoBar     *info_bar,
-                                                    gint            response_id);
+                                                    int             response_id);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_response               (GtkInfoBar     *info_bar,
-                                                    gint            response_id);
+                                                    int             response_id);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_info_bar_set_message_type       (GtkInfoBar     *info_bar,
index a42ff5a29d42eb246315f0cbfb92a436b59df33f..5003ba51aedf9f2ffd14eaeb5ca89efce5081b09 100644 (file)
@@ -283,9 +283,9 @@ struct _GtkLabel
 
   guint    mnemonic_keyval;
 
-  gint     width_chars;
-  gint     max_width_chars;
-  gint     lines;
+  int      width_chars;
+  int      max_width_chars;
+  int      lines;
 };
 
 struct _GtkLabelClass
@@ -294,7 +294,7 @@ struct _GtkLabelClass
 
   void (* move_cursor)     (GtkLabel       *self,
                             GtkMovementStep step,
-                            gint            count,
+                            int             count,
                             gboolean        extend_selection);
   void (* copy_clipboard)  (GtkLabel       *self);
 
@@ -338,14 +338,14 @@ typedef struct
   gboolean visited; /* get set when the link is activated; this flag
                      * gets preserved over later set_markup() calls
                      */
-  gint start;       /* position of the link in the PangoLayout */
-  gint end;
+  int start;       /* position of the link in the PangoLayout */
+  int end;
 } GtkLabelLink;
 
 struct _GtkLabelSelectionInfo
 {
-  gint selection_anchor;
-  gint selection_end;
+  int selection_anchor;
+  int selection_end;
   GtkCssNode *selection_node;
   GdkContentProvider *provider;
 
@@ -358,8 +358,8 @@ struct _GtkLabelSelectionInfo
   GtkGesture *click_gesture;
   GtkEventController *motion_controller;
 
-  gint drag_start_x;
-  gint drag_start_y;
+  int drag_start_x;
+  int drag_start_y;
 
   guint in_drag      : 1;
   guint select_words : 1;
@@ -439,8 +439,8 @@ static void gtk_label_leave             (GtkEventControllerMotion *controller,
 static gboolean gtk_label_grab_focus        (GtkWidget        *widget);
 
 static gboolean gtk_label_query_tooltip     (GtkWidget        *widget,
-                                             gint              x,
-                                             gint              y,
+                                             int               x,
+                                             int               y,
                                              gboolean          keyboard_tip,
                                              GtkTooltip       *tooltip);
 
@@ -471,8 +471,8 @@ static void gtk_label_update_cursor       (GtkLabel *self);
 static void gtk_label_clear_layout        (GtkLabel *self);
 static void gtk_label_ensure_layout       (GtkLabel *self);
 static void gtk_label_select_region_index (GtkLabel *self,
-                                           gint      anchor_index,
-                                           gint      end_index);
+                                           int       anchor_index,
+                                           int       end_index);
 
 static void gtk_label_update_active_link  (GtkWidget *widget,
                                            gdouble    x,
@@ -499,14 +499,14 @@ static void     gtk_label_buildable_custom_finished  (GtkBuildable       *builda
 /* For selectable labels: */
 static void gtk_label_move_cursor        (GtkLabel        *self,
                                          GtkMovementStep  step,
-                                         gint             count,
+                                         int              count,
                                          gboolean         extend_selection);
 static void gtk_label_copy_clipboard     (GtkLabel        *self);
 static void gtk_label_select_all         (GtkLabel        *self);
-static gint gtk_label_move_forward_word  (GtkLabel        *self,
-                                         gint             start);
-static gint gtk_label_move_backward_word (GtkLabel        *self,
-                                         gint             start);
+static int gtk_label_move_forward_word   (GtkLabel        *self,
+                                         int              start);
+static int gtk_label_move_backward_word  (GtkLabel        *self,
+                                         int              start);
 
 /* For links: */
 static void          gtk_label_clear_links      (GtkLabel  *self);
@@ -518,12 +518,12 @@ static void          emit_activate_link         (GtkLabel     *self,
 
 /* Event controller callbacks */
 static void   gtk_label_click_gesture_pressed  (GtkGestureClick *gesture,
-                                                     gint                  n_press,
+                                                     int                   n_press,
                                                      gdouble               x,
                                                      gdouble               y,
                                                      GtkLabel             *self);
 static void   gtk_label_click_gesture_released (GtkGestureClick *gesture,
-                                                     gint                  n_press,
+                                                     int                   n_press,
                                                      gdouble               x,
                                                      gdouble               y,
                                                      GtkLabel             *self);
@@ -578,7 +578,7 @@ add_move_binding (GtkWidgetClass *widget_class,
                  guint           keyval,
                  guint           modmask,
                  GtkMovementStep step,
-                 gint            count)
+                 int             count)
 {
   g_return_if_fail ((modmask & GDK_SHIFT_MASK) == 0);
   
@@ -1936,9 +1936,9 @@ start_element_handler (GMarkupParseContext  *context,
       const gchar *title = NULL;
       const gchar *class = NULL;
       gboolean visited = FALSE;
-      gint line_number;
-      gint char_number;
-      gint i;
+      int line_number;
+      int char_number;
+      int i;
       GtkCssNode *widget_node;
       GtkStateFlags state;
 
@@ -2019,7 +2019,7 @@ start_element_handler (GMarkupParseContext  *context,
     }
   else
     {
-      gint i;
+      int i;
 
       g_string_append_c (pdata->new_str, '<');
       g_string_append (pdata->new_str, element_name);
@@ -2567,7 +2567,7 @@ gtk_label_get_ellipsize (GtkLabel *self)
  **/
 void
 gtk_label_set_width_chars (GtkLabel *self,
-                          gint      n_chars)
+                          int       n_chars)
 {
   g_return_if_fail (GTK_IS_LABEL (self));
 
@@ -2588,7 +2588,7 @@ gtk_label_set_width_chars (GtkLabel *self,
  * 
  * Returns: the width of the label in characters.
  **/
-gint
+int
 gtk_label_get_width_chars (GtkLabel *self)
 {
   g_return_val_if_fail (GTK_IS_LABEL (self), -1);
@@ -2605,7 +2605,7 @@ gtk_label_get_width_chars (GtkLabel *self)
  **/
 void
 gtk_label_set_max_width_chars (GtkLabel *self,
-                              gint      n_chars)
+                              int       n_chars)
 {
   g_return_if_fail (GTK_IS_LABEL (self));
 
@@ -2627,7 +2627,7 @@ gtk_label_set_max_width_chars (GtkLabel *self,
  * 
  * Returns: the maximum width of the label in characters.
  **/
-gint
+int
 gtk_label_get_max_width_chars (GtkLabel *self)
 {
   g_return_val_if_fail (GTK_IS_LABEL (self), -1);
@@ -2970,14 +2970,14 @@ gtk_label_get_request_mode (GtkWidget *widget)
 
 static void
 get_height_for_width (GtkLabel *self,
-                      gint      width,
-                      gint     *minimum_height,
-                      gint     *natural_height,
-                      gint     *minimum_baseline,
-                      gint     *natural_baseline)
+                      int       width,
+                      int      *minimum_height,
+                      int      *natural_height,
+                      int      *minimum_baseline,
+                      int      *natural_baseline)
 {
   PangoLayout *layout;
-  gint text_height, baseline;
+  int text_height, baseline;
 
   layout = gtk_label_get_measuring_layout (self, NULL, width * PANGO_SCALE);
 
@@ -2993,13 +2993,13 @@ get_height_for_width (GtkLabel *self,
   g_object_unref (layout);
 }
 
-static gint
+static int
 get_char_pixels (GtkWidget   *self,
                  PangoLayout *layout)
 {
   PangoContext *context;
   PangoFontMetrics *metrics;
-  gint char_width, digit_width;
+  int char_width, digit_width;
 
   context = pango_layout_get_context (layout);
   metrics = pango_context_get_metrics (context,
@@ -3020,7 +3020,7 @@ gtk_label_get_preferred_layout_size (GtkLabel *self,
                                      int *widest_baseline)
 {
   PangoLayout *layout;
-  gint char_pixels;
+  int char_pixels;
 
   /* "width-chars" Hard-coded minimum width:
    *    - minimum size should be MAX (width-chars, strlen ("..."));
@@ -3095,10 +3095,10 @@ gtk_label_get_preferred_layout_size (GtkLabel *self,
 static void
 gtk_label_get_preferred_size (GtkWidget      *widget,
                               GtkOrientation  orientation,
-                              gint           *minimum_size,
-                              gint           *natural_size,
-                             gint           *minimum_baseline,
-                             gint           *natural_baseline)
+                              int            *minimum_size,
+                              int            *natural_size,
+                             int            *minimum_baseline,
+                             int            *natural_baseline)
 {
   GtkLabel      *self = GTK_LABEL (widget);
   PangoRectangle widest_rect;
@@ -3174,15 +3174,15 @@ gtk_label_measure (GtkWidget      *widget,
 
 static void
 get_layout_location (GtkLabel  *self,
-                     gint      *xp,
-                     gint      *yp)
+                     int       *xp,
+                     int       *yp)
 {
   GtkWidget *widget = GTK_WIDGET (self);
-  gint req_width, x, y;
-  gint req_height;
+  int req_width, x, y;
+  int req_height;
   gfloat xalign, yalign;
   PangoRectangle logical;
-  gint baseline, layout_baseline, baseline_offset;
+  int baseline, layout_baseline, baseline_offset;
   int label_width, label_height;
 
   xalign = self->xalign;
@@ -3418,7 +3418,7 @@ gtk_label_snapshot (GtkWidget   *widget,
   GtkLabel *self = GTK_LABEL (widget);
   GtkLabelSelectionInfo *info;
   GtkStyleContext *context;
-  gint lx, ly;
+  int lx, ly;
   int width, height, x;
 
   info = self->select_info;
@@ -3439,7 +3439,7 @@ gtk_label_snapshot (GtkWidget   *widget,
 
       if (info && (info->selection_anchor != info->selection_end))
         {
-          gint range[2];
+          int range[2];
           cairo_region_t *range_clip;
           cairo_rectangle_int_t clip_rect;
           int i;
@@ -3449,7 +3449,7 @@ gtk_label_snapshot (GtkWidget   *widget,
 
           if (range[0] > range[1])
             {
-              gint tmp = range[0];
+              int tmp = range[0];
               range[0] = range[1];
               range[1] = tmp;
             }
@@ -3475,7 +3475,7 @@ gtk_label_snapshot (GtkWidget   *widget,
         {
           GtkLabelLink *focus_link;
           GtkLabelLink *active_link;
-          gint range[2];
+          int range[2];
           cairo_region_t *range_clip;
           cairo_rectangle_int_t clip_rect;
           int i;
@@ -3588,11 +3588,11 @@ gtk_label_unrealize (GtkWidget *widget)
 
 static gboolean
 get_layout_index (GtkLabel *self,
-                  gint      x,
-                  gint      y,
-                  gint     *index)
+                  int       x,
+                  int       y,
+                  int      *index)
 {
-  gint trailing = 0;
+  int trailing = 0;
   const gchar *cluster;
   const gchar *cluster_end;
   gboolean inside;
@@ -3629,10 +3629,10 @@ get_layout_index (GtkLabel *self,
 
 static gboolean
 range_is_in_ellipsis_full (GtkLabel *self,
-                           gint      range_start,
-                           gint      range_end,
-                           gint     *ellipsis_start,
-                           gint     *ellipsis_end)
+                           int       range_start,
+                           int       range_end,
+                           int      *ellipsis_start,
+                           int      *ellipsis_end)
 {
   PangoLayoutIter *iter;
   gboolean in_ellipsis;
@@ -3683,8 +3683,8 @@ range_is_in_ellipsis_full (GtkLabel *self,
 
 static gboolean
 range_is_in_ellipsis (GtkLabel *self,
-                      gint      range_start,
-                      gint      range_end)
+                      int       range_start,
+                      int       range_end)
 {
   return range_is_in_ellipsis_full (self, range_start, range_end, NULL, NULL);
 }
@@ -3692,10 +3692,10 @@ range_is_in_ellipsis (GtkLabel *self,
 static void
 gtk_label_select_word (GtkLabel *self)
 {
-  gint min, max;
+  int min, max;
 
-  gint start_index = gtk_label_move_backward_word (self, self->select_info->selection_end);
-  gint end_index = gtk_label_move_forward_word (self, self->select_info->selection_end);
+  int start_index = gtk_label_move_backward_word (self, self->select_info->selection_end);
+  int end_index = gtk_label_move_forward_word (self, self->select_info->selection_end);
 
   min = MIN (self->select_info->selection_anchor,
             self->select_info->selection_end);
@@ -3794,7 +3794,7 @@ gtk_label_focus (GtkWidget        *widget,
 
   if (info->selectable)
     {
-      gint index;
+      int index;
 
       if (info->selection_anchor != info->selection_end)
         goto out;
@@ -3911,7 +3911,7 @@ out:
 
 static void
 gtk_label_click_gesture_pressed (GtkGestureClick *gesture,
-                                 gint             n_press,
+                                 int              n_press,
                                  gdouble          widget_x,
                                  gdouble          widget_y,
                                  GtkLabel        *self)
@@ -3988,14 +3988,14 @@ gtk_label_click_gesture_pressed (GtkGestureClick *gesture,
 
 static void
 gtk_label_click_gesture_released (GtkGestureClick *gesture,
-                                  gint             n_press,
+                                  int              n_press,
                                   gdouble          x,
                                   gdouble          y,
                                   GtkLabel        *self)
 {
   GtkLabelSelectionInfo *info = self->select_info;
   GdkEventSequence *sequence;
-  gint index;
+  int index;
 
   if (info == NULL)
     return;
@@ -4030,8 +4030,8 @@ get_selection_paintable (GtkLabel *self)
        self->select_info->selection_end) &&
       self->text)
     {
-      gint start, end;
-      gint len;
+      int start, end;
+      int len;
 
       start = MIN (self->select_info->selection_anchor,
                    self->select_info->selection_end);
@@ -4062,7 +4062,7 @@ gtk_label_drag_gesture_begin (GtkGestureDrag *gesture,
   GdkModifierType state_mask;
   GdkEventSequence *sequence;
   GdkEvent *event;
-  gint min, max, index;
+  int min, max, index;
 
   if (!info || !info->selectable)
     {
@@ -4099,7 +4099,7 @@ gtk_label_drag_gesture_begin (GtkGestureDrag *gesture,
       /* ensure the anchor is opposite index */
       if (index == min)
         {
-          gint tmp = min;
+          int tmp = min;
           min = max;
           max = tmp;
         }
@@ -4130,7 +4130,7 @@ gtk_label_drag_gesture_update (GtkGestureDrag *gesture,
   GtkWidget *widget = GTK_WIDGET (self);
   GdkEventSequence *sequence;
   gdouble x, y;
-  gint index;
+  int index;
 
   if (info == NULL || !info->selectable)
     return;
@@ -4172,9 +4172,9 @@ gtk_label_drag_gesture_update (GtkGestureDrag *gesture,
 
       if (info->select_words)
         {
-          gint min, max;
-          gint old_min, old_max;
-          gint anchor, end;
+          int min, max;
+          int old_min, old_max;
+          int anchor, end;
 
           min = gtk_label_move_backward_word (self, index);
           max = gtk_label_move_forward_word (self, index);
@@ -4220,7 +4220,7 @@ gtk_label_update_active_link (GtkWidget *widget,
 {
   GtkLabel *self = GTK_LABEL (widget);
   GtkLabelSelectionInfo *info = self->select_info;
-  gint index;
+  int index;
 
   if (info == NULL)
     return;
@@ -4350,8 +4350,8 @@ gtk_label_content_get_value (GdkContentProvider  *provider,
            self->select_info->selection_end) &&
           self->text)
         {
-          gint start, end;
-          gint len;
+          int start, end;
+          int len;
           char *str;
 
           start = MIN (self->select_info->selection_anchor,
@@ -4534,8 +4534,8 @@ gtk_label_get_selectable (GtkLabel *self)
 
 static void
 gtk_label_select_region_index (GtkLabel *self,
-                               gint      anchor_index,
-                               gint      end_index)
+                               int       anchor_index,
+                               int       end_index)
 {
   g_return_if_fail (GTK_IS_LABEL (self));
   gboolean anchor_changed;
@@ -4544,7 +4544,7 @@ gtk_label_select_region_index (GtkLabel *self,
   if (self->select_info && self->select_info->selectable)
     {
       GdkClipboard *clipboard;
-      gint s, e;
+      int s, e;
 
       /* Ensure that we treat an ellipsized region like a single
        * character with respect to selection.
@@ -4668,8 +4668,8 @@ gtk_label_select_region_index (GtkLabel *self,
  **/
 void
 gtk_label_select_region  (GtkLabel *self,
-                          gint      start_offset,
-                          gint      end_offset)
+                          int       start_offset,
+                          int       end_offset)
 {
   g_return_if_fail (GTK_IS_LABEL (self));
 
@@ -4700,8 +4700,8 @@ gtk_label_select_region  (GtkLabel *self,
  **/
 gboolean
 gtk_label_get_selection_bounds (GtkLabel  *self,
-                                gint      *start,
-                                gint      *end)
+                                int       *start,
+                                int       *end)
 {
   g_return_val_if_fail (GTK_IS_LABEL (self), FALSE);
 
@@ -4717,9 +4717,9 @@ gtk_label_get_selection_bounds (GtkLabel  *self,
     }
   else
     {
-      gint start_index, end_index;
-      gint start_offset, end_offset;
-      gint len;
+      int start_index, end_index;
+      int start_offset, end_offset;
+      int len;
       
       start_index = MIN (self->select_info->selection_anchor,
                    self->select_info->selection_end);
@@ -4739,7 +4739,7 @@ gtk_label_get_selection_bounds (GtkLabel  *self,
 
       if (start_offset > end_offset)
         {
-          gint tmp = start_offset;
+          int tmp = start_offset;
           start_offset = end_offset;
           end_offset = tmp;
         }
@@ -4793,8 +4793,8 @@ gtk_label_get_layout (GtkLabel *self)
  **/
 void
 gtk_label_get_layout_offsets (GtkLabel *self,
-                              gint     *x,
-                              gint     *y)
+                              int      *x,
+                              int      *y)
 {
   g_return_if_fail (GTK_IS_LABEL (self));
 
@@ -4986,19 +4986,19 @@ get_better_cursor (GtkLabel *self,
 }
 
 
-static gint
+static int
 gtk_label_move_logically (GtkLabel *self,
-                         gint      start,
-                         gint      count)
+                         int       start,
+                         int       count)
 {
-  gint offset = g_utf8_pointer_to_offset (self->text,
+  int offset = g_utf8_pointer_to_offset (self->text,
                                          self->text + start);
 
   if (self->text)
     {
       const PangoLogAttr *log_attrs;
-      gint n_attrs;
-      gint length;
+      int n_attrs;
+      int length;
 
       gtk_label_ensure_layout (self);
 
@@ -5027,12 +5027,12 @@ gtk_label_move_logically (GtkLabel *self,
   return g_utf8_offset_to_pointer (self->text, offset) - self->text;
 }
 
-static gint
+static int
 gtk_label_move_visually (GtkLabel *self,
-                        gint      start,
-                        gint      count)
+                        int       start,
+                        int       count)
 {
-  gint index;
+  int index;
 
   index = start;
   
@@ -5092,19 +5092,19 @@ gtk_label_move_visually (GtkLabel *self,
   return index;
 }
 
-static gint
+static int
 gtk_label_move_forward_word (GtkLabel *self,
-                            gint      start)
+                            int       start)
 {
-  gint new_pos = g_utf8_pointer_to_offset (self->text,
+  int new_pos = g_utf8_pointer_to_offset (self->text,
                                           self->text + start);
-  gint length;
+  int length;
 
   length = g_utf8_strlen (self->text, -1);
   if (new_pos < length)
     {
       const PangoLogAttr *log_attrs;
-      gint n_attrs;
+      int n_attrs;
 
       gtk_label_ensure_layout (self);
 
@@ -5120,17 +5120,17 @@ gtk_label_move_forward_word (GtkLabel *self,
 }
 
 
-static gint
+static int
 gtk_label_move_backward_word (GtkLabel *self,
-                             gint      start)
+                             int       start)
 {
-  gint new_pos = g_utf8_pointer_to_offset (self->text,
+  int new_pos = g_utf8_pointer_to_offset (self->text,
                                           self->text + start);
 
   if (new_pos > 0)
     {
       const PangoLogAttr *log_attrs;
-      gint n_attrs;
+      int n_attrs;
 
       gtk_label_ensure_layout (self);
 
@@ -5149,11 +5149,11 @@ gtk_label_move_backward_word (GtkLabel *self,
 static void
 gtk_label_move_cursor (GtkLabel       *self,
                        GtkMovementStep step,
-                       gint            count,
+                       int             count,
                        gboolean        extend_selection)
 {
-  gint old_pos;
-  gint new_pos;
+  int old_pos;
+  int new_pos;
 
   if (self->select_info == NULL)
     return;
@@ -5170,8 +5170,8 @@ gtk_label_move_cursor (GtkLabel       *self,
         {
         case GTK_MOVEMENT_VISUAL_POSITIONS:
           {
-            gint end_x, end_y;
-            gint anchor_x, anchor_y;
+            int end_x, end_y;
+            int anchor_x, anchor_y;
             gboolean end_is_left;
 
             get_better_cursor (self, self->select_info->selection_end, &end_x, &end_y);
@@ -5279,8 +5279,8 @@ gtk_label_copy_clipboard (GtkLabel *self)
 {
   if (self->text && self->select_info)
     {
-      gint start, end;
-      gint len;
+      int start, end;
+      int len;
       GdkClipboard *clipboard;
 
       start = MIN (self->select_info->selection_anchor,
@@ -5596,14 +5596,14 @@ gtk_label_get_current_uri (GtkLabel *self)
 
 static gboolean
 gtk_label_query_tooltip (GtkWidget  *widget,
-                         gint        x,
-                         gint        y,
+                         int         x,
+                         int         y,
                          gboolean    keyboard_tip,
                          GtkTooltip *tooltip)
 {
   GtkLabel *self = GTK_LABEL (widget);
   GtkLabelSelectionInfo *info = self->select_info;
-  gint index = -1;
+  int index = -1;
 
   if (info && info->links)
     {
@@ -5640,7 +5640,7 @@ gtk_label_query_tooltip (GtkWidget  *widget,
                                                                    tooltip);
 }
 
-gint
+int
 _gtk_label_get_cursor_position (GtkLabel *self)
 {
   if (self->select_info && self->select_info->selectable)
@@ -5650,7 +5650,7 @@ _gtk_label_get_cursor_position (GtkLabel *self)
   return 0;
 }
 
-gint
+int
 _gtk_label_get_selection_bound (GtkLabel *self)
 {
   if (self->select_info && self->select_info->selectable)
@@ -5672,7 +5672,7 @@ _gtk_label_get_selection_bound (GtkLabel *self)
  */
 void
 gtk_label_set_lines (GtkLabel *self,
-                     gint      lines)
+                     int       lines)
 {
   g_return_if_fail (GTK_IS_LABEL (self));
 
@@ -5694,7 +5694,7 @@ gtk_label_set_lines (GtkLabel *self,
  *
  * Returns: The number of lines
  */
-gint
+int
 gtk_label_get_lines (GtkLabel *self)
 {
   g_return_val_if_fail (GTK_IS_LABEL (self), -1);
@@ -5702,7 +5702,7 @@ gtk_label_get_lines (GtkLabel *self)
   return self->lines;
 }
 
-gint
+int
 _gtk_label_get_n_links (GtkLabel *self)
 {
   if (self->select_info)
@@ -5713,7 +5713,7 @@ _gtk_label_get_n_links (GtkLabel *self)
 
 const gchar *
 _gtk_label_get_link_uri (GtkLabel *self,
-                         gint      idx)
+                         int       idx)
 {
   if (self->select_info)
     return self->select_info->links[idx].uri;
@@ -5723,9 +5723,9 @@ _gtk_label_get_link_uri (GtkLabel *self,
 
 void
 _gtk_label_get_link_extent (GtkLabel *self,
-                            gint      idx,
-                            gint     *start,
-                            gint     *end)
+                            int       idx,
+                            int      *start,
+                            int      *end)
 {
   if (self->select_info)
     {
@@ -5763,7 +5763,7 @@ _gtk_label_get_link_at (GtkLabel *self,
 
 void
 _gtk_label_activate_link (GtkLabel *self,
-                          gint      idx)
+                          int       idx)
 {
   if (self->select_info)
     {
@@ -5775,7 +5775,7 @@ _gtk_label_activate_link (GtkLabel *self,
 
 gboolean
 _gtk_label_get_link_visited (GtkLabel *self,
-                             gint      idx)
+                             int       idx)
 {
   if (self->select_info)
     return self->select_info->links[idx].visited;
@@ -5785,7 +5785,7 @@ _gtk_label_get_link_visited (GtkLabel *self,
 
 gboolean
 _gtk_label_get_link_focused (GtkLabel *self,
-                             gint      idx)
+                             int       idx)
 {
   GtkLabelSelectionInfo *info = self->select_info;
 
index 7a89b6a2fead3d48d8bb9960bd2418df81b45070..367972fb3f45029c7c84090e802a8511947ad7ac 100644 (file)
@@ -101,17 +101,17 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_width_chars                (GtkLabel         *self,
                                                    int               n_chars);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_label_get_width_chars                (GtkLabel         *self);
+int      gtk_label_get_width_chars                (GtkLabel         *self);
 GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_max_width_chars            (GtkLabel         *self,
                                                    int               n_chars);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_label_get_max_width_chars            (GtkLabel         *self);
+int      gtk_label_get_max_width_chars            (GtkLabel         *self);
 GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_lines                      (GtkLabel         *self,
-                                                   gint              lines);
+                                                   int               lines);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_label_get_lines                      (GtkLabel         *self);
+int      gtk_label_get_lines                      (GtkLabel         *self);
 GDK_AVAILABLE_IN_ALL
 void     gtk_label_set_wrap                       (GtkLabel         *self,
                                                    gboolean          wrap);
@@ -129,19 +129,19 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_label_get_selectable                 (GtkLabel         *self);
 GDK_AVAILABLE_IN_ALL
 void     gtk_label_select_region                  (GtkLabel         *self,
-                                                  gint              start_offset,
-                                                  gint              end_offset);
+                                                  int               start_offset,
+                                                  int               end_offset);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_label_get_selection_bounds           (GtkLabel         *self,
-                                                   gint             *start,
-                                                   gint             *end);
+                                                   int              *start,
+                                                   int              *end);
 
 GDK_AVAILABLE_IN_ALL
 PangoLayout *gtk_label_get_layout         (GtkLabel *self);
 GDK_AVAILABLE_IN_ALL
 void         gtk_label_get_layout_offsets (GtkLabel *self,
-                                           gint     *x,
-                                           gint     *y);
+                                           int      *x,
+                                           int      *y);
 
 GDK_AVAILABLE_IN_ALL
 void         gtk_label_set_single_line_mode  (GtkLabel *self,
index f99c50fca5a127f2de1dc8bcb3d9f827703deaec..42b624a59d15aac8c955e45bece17b1d38399cc5 100644 (file)
@@ -26,24 +26,24 @@ G_BEGIN_DECLS
 
 void _gtk_label_mnemonics_visible_apply_recursively (GtkWidget *widget,
                                                      gboolean   mnemonics_visible);
-gint _gtk_label_get_cursor_position (GtkLabel *label);
-gint _gtk_label_get_selection_bound (GtkLabel *label);
+int _gtk_label_get_cursor_position (GtkLabel *label);
+int _gtk_label_get_selection_bound (GtkLabel *label);
 
-gint         _gtk_label_get_n_links     (GtkLabel *label);
-gint         _gtk_label_get_link_at     (GtkLabel *label,
-                                         gint      pos);
+int          _gtk_label_get_n_links     (GtkLabel *label);
+int          _gtk_label_get_link_at     (GtkLabel *label,
+                                         int       pos);
 void         _gtk_label_activate_link   (GtkLabel *label, 
-                                         gint      idx);
+                                         int       idx);
 const gchar *_gtk_label_get_link_uri    (GtkLabel *label,
-                                         gint      idx);
+                                         int       idx);
 void         _gtk_label_get_link_extent (GtkLabel *label,
-                                         gint      idx,
-                                         gint     *start,
-                                         gint     *end);
+                                         int       idx,
+                                         int      *start,
+                                         int      *end);
 gboolean     _gtk_label_get_link_visited (GtkLabel *label,
-                                          gint      idx);
+                                          int       idx);
 gboolean     _gtk_label_get_link_focused (GtkLabel *label,
-                                          gint      idx);
+                                          int       idx);
                              
 G_END_DECLS
 
index 321c152128a4194d5fcb5c7b12e75991924e8ba3..41811c89b8000809f12da7d17c0c71c6ff59ab24 100644 (file)
@@ -219,7 +219,7 @@ gtk_level_bar_offset_free (GtkLevelBarOffset *offset)
   g_slice_free (GtkLevelBarOffset, offset);
 }
 
-static gint
+static int
 offset_find_func (gconstpointer data,
                   gconstpointer user_data)
 {
@@ -229,7 +229,7 @@ offset_find_func (gconstpointer data,
   return g_strcmp0 (name, offset->name);
 }
 
-static gint
+static int
 offset_sort_func (gconstpointer a,
                   gconstpointer b)
 {
@@ -278,18 +278,18 @@ gtk_level_bar_value_in_interval (GtkLevelBar *self,
 }
 #endif
 
-static gint
+static int
 gtk_level_bar_get_num_blocks (GtkLevelBar *self)
 {
   if (self->bar_mode == GTK_LEVEL_BAR_MODE_CONTINUOUS)
     return 1;
   else if (self->bar_mode == GTK_LEVEL_BAR_MODE_DISCRETE)
-    return MAX (1, (gint) (round (self->max_value) - round (self->min_value)));
+    return MAX (1, (int) (round (self->max_value) - round (self->min_value)));
 
   return 0;
 }
 
-static gint
+static int
 gtk_level_bar_get_num_block_nodes (GtkLevelBar *self)
 {
   if (self->bar_mode == GTK_LEVEL_BAR_MODE_CONTINUOUS)
@@ -300,11 +300,11 @@ gtk_level_bar_get_num_block_nodes (GtkLevelBar *self)
 
 static void
 gtk_level_bar_get_min_block_size (GtkLevelBar *self,
-                                  gint        *block_width,
-                                  gint        *block_height)
+                                  int         *block_width,
+                                  int         *block_height)
 {
   guint i, n_blocks;
-  gint width, height;
+  int width, height;
 
   *block_width = *block_height = 0;
   n_blocks = gtk_level_bar_get_num_block_nodes (self);
@@ -359,7 +359,7 @@ gtk_level_bar_render_trough (GtkGizmo    *gizmo,
     }
   else
     {
-      gint num_blocks, i;
+      int num_blocks, i;
 
       num_blocks = gtk_level_bar_get_num_blocks (self);
 
@@ -379,8 +379,8 @@ gtk_level_bar_measure_trough (GtkGizmo       *gizmo,
 {
   GtkWidget *widget = GTK_WIDGET (gizmo);
   GtkLevelBar *self = GTK_LEVEL_BAR (gtk_widget_get_parent (widget));
-  gint num_blocks, size;
-  gint block_width, block_height;
+  int num_blocks, size;
+  int block_width, block_height;
 
   num_blocks = gtk_level_bar_get_num_blocks (self);
   gtk_level_bar_get_min_block_size (self, &block_width, &block_height);
@@ -437,7 +437,7 @@ gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self,
 
   if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
-      block_area.width = (gint) floor (block_area.width * fill_percentage);
+      block_area.width = (int) floor (block_area.width * fill_percentage);
       block_area.width = MAX (block_area.width, block_min);
 
       if (inverted)
@@ -445,7 +445,7 @@ gtk_level_bar_allocate_trough_continuous (GtkLevelBar *self,
     }
   else
     {
-      block_area.height = (gint) floor (block_area.height * fill_percentage);
+      block_area.height = (int) floor (block_area.height * fill_percentage);
       block_area.height = MAX (block_area.height, block_min);
 
       if (inverted)
@@ -464,8 +464,8 @@ gtk_level_bar_allocate_trough_discrete (GtkLevelBar *self,
                                         int          baseline)
 {
   GtkAllocation block_area;
-  gint num_blocks, i;
-  gint block_width, block_height;
+  int num_blocks, i;
+  int block_width, block_height;
 
   gtk_level_bar_get_min_block_size (self, &block_width, &block_height);
   num_blocks = gtk_level_bar_get_num_blocks (self);
@@ -475,13 +475,13 @@ gtk_level_bar_allocate_trough_discrete (GtkLevelBar *self,
 
   if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
     {
-      block_width = MAX (block_width, (gint) floor (width / num_blocks));
+      block_width = MAX (block_width, (int) floor (width / num_blocks));
       block_height = height;
     }
   else
     {
       block_width = width;
-      block_height = MAX (block_height, (gint) floor (height / num_blocks));
+      block_height = MAX (block_height, (int) floor (height / num_blocks));
     }
 
   block_area.x = 0;
@@ -573,7 +573,7 @@ update_level_style_classes (GtkLevelBar *self)
   const gchar *value_class = NULL;
   GtkLevelBarOffset *offset, *prev_offset;
   GList *l;
-  gint num_filled, num_blocks, i;
+  int num_filled, num_blocks, i;
   gboolean inverted;
 
   value = gtk_level_bar_get_value (self);
@@ -607,7 +607,7 @@ update_level_style_classes (GtkLevelBar *self)
   if (self->bar_mode == GTK_LEVEL_BAR_MODE_CONTINUOUS)
     num_filled = 1;
   else
-    num_filled = MIN (num_blocks, (gint) round (self->cur_value) - (gint) round (self->min_value));
+    num_filled = MIN (num_blocks, (int) round (self->cur_value) - (int) round (self->min_value));
 
   for (i = 0; i < num_filled; i++)
     {
@@ -883,7 +883,7 @@ static void
 gtk_level_bar_finalize (GObject *obj)
 {
   GtkLevelBar *self = GTK_LEVEL_BAR (obj);
-  gint i;
+  int i;
 
   g_list_free_full (self->offsets, (GDestroyNotify) gtk_level_bar_offset_free);
 
index 21084de8a7e96c465e7b0a0d92b45b338d6c0300..38755b92dbf49b3db9073b88c701aea926a170ae 100644 (file)
@@ -121,8 +121,8 @@ static void     gtk_link_button_popup_menu   (GtkWidget        *widget,
                                               const char       *action_name,
                                               GVariant         *parameters);
 static gboolean gtk_link_button_query_tooltip_cb (GtkWidget    *widget,
-                                                  gint          x,
-                                                  gint          y,
+                                                  int           x,
+                                                  int           y,
                                                   gboolean      keyboard_tip,
                                                   GtkTooltip   *tooltip,
                                                   gpointer      data);
@@ -583,8 +583,8 @@ gtk_link_button_new_with_label (const gchar *uri,
 
 static gboolean 
 gtk_link_button_query_tooltip_cb (GtkWidget    *widget,
-                                  gint          x,
-                                  gint          y,
+                                  int           x,
+                                  int           y,
                                   gboolean      keyboard_tip,
                                   GtkTooltip   *tooltip,
                                   gpointer      data)
index b770e85e4f00c17644afa4732a817f777795fa5e..0601c3da659fe559b085e2b7133c4991f4da9978 100644 (file)
@@ -147,7 +147,7 @@ struct _GtkListBoxClass
   void (*toggle_cursor_row)   (GtkListBox      *box);
   void (*move_cursor)         (GtkListBox      *box,
                                GtkMovementStep  step,
-                               gint             count,
+                               int              count,
                                gboolean         extend,
                                gboolean         modify);
   void (*selected_rows_changed) (GtkListBox    *box);
@@ -161,8 +161,8 @@ typedef struct
   GSequenceIter *iter;
   GtkWidget *header;
   GtkActionHelper *action_helper;
-  gint y;
-  gint height;
+  int y;
+  int height;
   guint visible     :1;
   guint selected    :1;
   guint activatable :1;
@@ -237,7 +237,7 @@ static void                 gtk_list_box_add_move_binding             (GtkWidget
                                                                        guint                keyval,
                                                                        GdkModifierType      modmask,
                                                                        GtkMovementStep      step,
-                                                                       gint                 count);
+                                                                       int                  count);
 static void                 gtk_list_box_update_cursor                (GtkListBox          *box,
                                                                        GtkListBoxRow       *row,
                                                                        gboolean             grab_focus);
@@ -260,7 +260,7 @@ static void                 gtk_list_box_activate_cursor_row          (GtkListBo
 static void                 gtk_list_box_toggle_cursor_row            (GtkListBox          *box);
 static void                 gtk_list_box_move_cursor                  (GtkListBox          *box,
                                                                        GtkMovementStep      step,
-                                                                       gint                 count,
+                                                                       int                  count,
                                                                        gboolean             extend,
                                                                        gboolean             modify);
 static void                 gtk_list_box_parent_cb                    (GObject             *object,
@@ -749,7 +749,7 @@ gtk_list_box_get_selected_row (GtkListBox *box)
  */
 GtkListBoxRow *
 gtk_list_box_get_row_at_index (GtkListBox *box,
-                               gint        index_)
+                               int         index_)
 {
   GSequenceIter *iter;
 
@@ -791,7 +791,7 @@ row_y_cmp_func (gconstpointer a,
  */
 GtkListBoxRow *
 gtk_list_box_get_row_at_y (GtkListBox *box,
-                           gint        y)
+                           int         y)
 {
   GSequenceIter *iter;
 
@@ -1248,7 +1248,7 @@ gtk_list_box_invalidate_filter (GtkListBox *box)
   gtk_widget_queue_resize (GTK_WIDGET (box));
 }
 
-static gint
+static int
 do_sort (GtkListBoxRow *a,
          GtkListBoxRow *b,
          GtkListBox    *box)
@@ -1457,7 +1457,7 @@ gtk_list_box_add_move_binding (GtkWidgetClass  *widget_class,
                                guint            keyval,
                                GdkModifierType  modmask,
                                GtkMovementStep  step,
-                               gint             count)
+                               int              count)
 {
   gtk_widget_class_add_binding_signal (widget_class,
                                        keyval, modmask,
@@ -1482,7 +1482,7 @@ ensure_row_visible (GtkListBox    *box,
                     GtkListBoxRow *row)
 {
   GtkWidget *header;
-  gint y, height;
+  int y, height;
   graphene_rect_t rect;
 
   if (!box->adjustment)
@@ -2016,7 +2016,7 @@ gtk_list_box_focus (GtkWidget        *widget,
 
 static void
 list_box_add_visible_rows (GtkListBox *box,
-                           gint        n)
+                           int         n)
 {
   int was_zero;
 
@@ -2426,8 +2426,8 @@ gtk_list_box_measure (GtkWidget     *widget,
            iter = g_sequence_iter_next (iter))
         {
           GtkListBoxRow *row;
-          gint row_min;
-          gint row_nat;
+          int row_min;
+          int row_nat;
 
           row = g_sequence_get (iter);
 
@@ -2475,7 +2475,7 @@ gtk_list_box_measure (GtkWidget     *widget,
            iter = g_sequence_iter_next (iter))
         {
           GtkListBoxRow *row;
-          gint row_min = 0;
+          int row_min = 0;
 
           row = g_sequence_get (iter);
           if (!row_is_visible (row))
@@ -2607,7 +2607,7 @@ gtk_list_box_prepend (GtkListBox *box,
 void
 gtk_list_box_insert (GtkListBox *box,
                      GtkWidget  *child,
-                     gint        position)
+                     int         position)
 {
   GtkListBoxRow *row;
   GSequenceIter *prev = NULL;
@@ -2727,15 +2727,15 @@ gtk_list_box_toggle_cursor_row (GtkListBox *box)
 static void
 gtk_list_box_move_cursor (GtkListBox      *box,
                           GtkMovementStep  step,
-                          gint             count,
+                          int              count,
                           gboolean         extend,
                           gboolean         modify)
 {
   GtkListBoxRow *row;
-  gint page_size;
+  int page_size;
   GSequenceIter *iter;
-  gint start_y;
-  gint end_y;
+  int start_y;
+  int end_y;
   int height;
 
   row = NULL;
@@ -2750,7 +2750,7 @@ gtk_list_box_move_cursor (GtkListBox      *box,
     case GTK_MOVEMENT_DISPLAY_LINES:
       if (box->cursor_row != NULL)
         {
-          gint i = count;
+          int i = count;
 
           iter = ROW_PRIV (box->cursor_row)->iter;
 
@@ -3091,7 +3091,7 @@ gtk_list_box_row_set_header (GtkListBoxRow *row,
  *
  * Returns: the index of the @row, or -1 if the @row is not in a listbox
  */
-gint
+int
 gtk_list_box_row_get_index (GtkListBoxRow *row)
 {
   GtkListBoxRowPrivate *priv = ROW_PRIV (row);
index da77299bc0a0d78244a0436d7b956870843c2ff4..b39f55154a3d675b55e3c5b9e7f07d9bb805c8a7 100644 (file)
@@ -93,9 +93,9 @@ typedef gboolean (*GtkListBoxFilterFunc) (GtkListBoxRow *row,
  * Returns: < 0 if @row1 should be before @row2, 0 if they are
  *     equal and > 0 otherwise
  */
-typedef gint (*GtkListBoxSortFunc) (GtkListBoxRow *row1,
-                                    GtkListBoxRow *row2,
-                                    gpointer       user_data);
+typedef int (*GtkListBoxSortFunc) (GtkListBoxRow *row1,
+                                   GtkListBoxRow *row2,
+                                   gpointer       user_data);
 
 /**
  * GtkListBoxUpdateHeaderFunc:
@@ -142,7 +142,7 @@ GDK_AVAILABLE_IN_ALL
 void       gtk_list_box_row_set_header    (GtkListBoxRow *row,
                                            GtkWidget     *header);
 GDK_AVAILABLE_IN_ALL
-gint       gtk_list_box_row_get_index     (GtkListBoxRow *row);
+int        gtk_list_box_row_get_index     (GtkListBoxRow *row);
 GDK_AVAILABLE_IN_ALL
 void       gtk_list_box_row_changed       (GtkListBoxRow *row);
 
@@ -170,7 +170,7 @@ void           gtk_list_box_prepend                      (GtkListBox
 GDK_AVAILABLE_IN_ALL
 void           gtk_list_box_insert                       (GtkListBox                    *box,
                                                           GtkWidget                     *child,
-                                                          gint                           position);
+                                                          int                            position);
 GDK_AVAILABLE_IN_ALL
 void           gtk_list_box_remove                       (GtkListBox                    *box,
                                                           GtkWidget                     *child);
@@ -178,10 +178,10 @@ GDK_AVAILABLE_IN_ALL
 GtkListBoxRow* gtk_list_box_get_selected_row             (GtkListBox                    *box);
 GDK_AVAILABLE_IN_ALL
 GtkListBoxRow* gtk_list_box_get_row_at_index             (GtkListBox                    *box,
-                                                          gint                           index_);
+                                                          int                            index_);
 GDK_AVAILABLE_IN_ALL
 GtkListBoxRow* gtk_list_box_get_row_at_y                 (GtkListBox                    *box,
-                                                          gint                           y);
+                                                          int                            y);
 GDK_AVAILABLE_IN_ALL
 void           gtk_list_box_select_row                   (GtkListBox                    *box,
                                                           GtkListBoxRow                 *row);
index 3e6a3eaa49bbe1b4f4ff2b87c984b144c4bd8e01..edd4630f0fe7126a209b0ea81ed9b9dfebfdcc84 100644 (file)
@@ -66,7 +66,7 @@
  *   GtkListStore *list_store;
  *   GtkTreePath *path;
  *   GtkTreeIter iter;
- *   gint i;
+ *   int i;
  *
  *   list_store = gtk_list_store_new (N_COLUMNS,
  *                                    G_TYPE_STRING,
@@ -181,10 +181,10 @@ struct _GtkListStorePrivate
   GList *sort_list;
   GType *column_headers;
 
-  gint stamp;
-  gint n_columns;
-  gint sort_column_id;
-  gint length;
+  int stamp;
+  int n_columns;
+  int sort_column_id;
+  int length;
 
   GtkSortType order;
 
@@ -202,9 +202,9 @@ static void         gtk_list_store_sortable_init   (GtkTreeSortableIface   *ifac
 static void         gtk_list_store_buildable_init  (GtkBuildableIface      *iface);
 static void         gtk_list_store_finalize        (GObject           *object);
 static GtkTreeModelFlags gtk_list_store_get_flags  (GtkTreeModel      *tree_model);
-static gint         gtk_list_store_get_n_columns   (GtkTreeModel      *tree_model);
+static int          gtk_list_store_get_n_columns   (GtkTreeModel      *tree_model);
 static GType        gtk_list_store_get_column_type (GtkTreeModel      *tree_model,
-                                                   gint               index);
+                                                   int                index);
 static gboolean     gtk_list_store_get_iter        (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
                                                    GtkTreePath       *path);
@@ -212,7 +212,7 @@ static GtkTreePath *gtk_list_store_get_path        (GtkTreeModel      *tree_mode
                                                    GtkTreeIter       *iter);
 static void         gtk_list_store_get_value       (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
-                                                   gint               column,
+                                                   int                column,
                                                    GValue            *value);
 static gboolean     gtk_list_store_iter_next       (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter);
@@ -223,21 +223,21 @@ static gboolean     gtk_list_store_iter_children   (GtkTreeModel      *tree_mode
                                                    GtkTreeIter       *parent);
 static gboolean     gtk_list_store_iter_has_child  (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter);
-static gint         gtk_list_store_iter_n_children (GtkTreeModel      *tree_model,
+static int          gtk_list_store_iter_n_children (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter);
 static gboolean     gtk_list_store_iter_nth_child  (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
                                                    GtkTreeIter       *parent,
-                                                   gint               n);
+                                                   int                n);
 static gboolean     gtk_list_store_iter_parent     (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
                                                    GtkTreeIter       *child);
 
 
 static void gtk_list_store_set_n_columns   (GtkListStore *list_store,
-                                           gint          n_columns);
+                                           int           n_columns);
 static void gtk_list_store_set_column_type (GtkListStore *list_store,
-                                           gint          column,
+                                           int           column,
                                            GType         type);
 
 static void gtk_list_store_increment_stamp (GtkListStore *list_store);
@@ -263,15 +263,15 @@ static gboolean gtk_list_store_row_drop_possible  (GtkTreeDragDest   *drag_dest,
 static void     gtk_list_store_sort                  (GtkListStore           *list_store);
 static void     gtk_list_store_sort_iter_changed     (GtkListStore           *list_store,
                                                      GtkTreeIter            *iter,
-                                                     gint                    column);
+                                                     int                     column);
 static gboolean gtk_list_store_get_sort_column_id    (GtkTreeSortable        *sortable,
-                                                     gint                   *sort_column_id,
+                                                     int                    *sort_column_id,
                                                      GtkSortType            *order);
 static void     gtk_list_store_set_sort_column_id    (GtkTreeSortable        *sortable,
-                                                     gint                    sort_column_id,
+                                                     int                     sort_column_id,
                                                      GtkSortType             order);
 static void     gtk_list_store_set_sort_func         (GtkTreeSortable        *sortable,
-                                                     gint                    sort_column_id,
+                                                     int                     sort_column_id,
                                                      GtkTreeIterCompareFunc  func,
                                                      gpointer                data,
                                                      GDestroyNotify          destroy);
@@ -412,12 +412,12 @@ iter_is_valid (GtkTreeIter  *iter,
  * Returns: a new #GtkListStore
  */
 GtkListStore *
-gtk_list_store_new (gint n_columns,
+gtk_list_store_new (int n_columns,
                    ...)
 {
   GtkListStore *retval;
   va_list args;
-  gint i;
+  int i;
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
@@ -457,11 +457,11 @@ gtk_list_store_new (gint n_columns,
  * Returns: (transfer full): a new #GtkListStore
  **/
 GtkListStore *
-gtk_list_store_newv (gint   n_columns,
+gtk_list_store_newv (int    n_columns,
                     GType *types)
 {
   GtkListStore *retval;
-  gint i;
+  int i;
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
@@ -496,11 +496,11 @@ gtk_list_store_newv (gint   n_columns,
  **/
 void
 gtk_list_store_set_column_types (GtkListStore *list_store,
-                                gint          n_columns,
+                                int           n_columns,
                                 GType        *types)
 {
   GtkListStorePrivate *priv;
-  gint i;
+  int i;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
 
@@ -522,7 +522,7 @@ gtk_list_store_set_column_types (GtkListStore *list_store,
 
 static void
 gtk_list_store_set_n_columns (GtkListStore *list_store,
-                             gint          n_columns)
+                             int           n_columns)
 {
   GtkListStorePrivate *priv = list_store->priv;
   int i;
@@ -542,7 +542,7 @@ gtk_list_store_set_n_columns (GtkListStore *list_store,
 
 static void
 gtk_list_store_set_column_type (GtkListStore *list_store,
-                               gint          column,
+                               int           column,
                                GType         type)
 {
   GtkListStorePrivate *priv = list_store->priv;
@@ -589,7 +589,7 @@ gtk_list_store_get_flags (GtkTreeModel *tree_model)
   return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY;
 }
 
-static gint
+static int
 gtk_list_store_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
@@ -602,7 +602,7 @@ gtk_list_store_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 gtk_list_store_get_column_type (GtkTreeModel *tree_model,
-                               gint          index)
+                               int           index)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
   GtkListStorePrivate *priv = list_store->priv;
@@ -622,7 +622,7 @@ gtk_list_store_get_iter (GtkTreeModel *tree_model,
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
   GtkListStorePrivate *priv = list_store->priv;
   GSequence *seq;
-  gint i;
+  int i;
 
   priv->columns_dirty = TRUE;
 
@@ -664,13 +664,13 @@ gtk_list_store_get_path (GtkTreeModel *tree_model,
 static void
 gtk_list_store_get_value (GtkTreeModel *tree_model,
                          GtkTreeIter  *iter,
-                         gint          column,
+                         int           column,
                          GValue       *value)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
   GtkListStorePrivate *priv = list_store->priv;
   GtkTreeDataList *list;
-  gint tmp_column = column;
+  int tmp_column = column;
 
   g_return_if_fail (column < priv->n_columns);
   g_return_if_fail (iter_is_valid (iter, list_store));
@@ -761,7 +761,7 @@ gtk_list_store_iter_has_child (GtkTreeModel *tree_model,
   return FALSE;
 }
 
-static gint
+static int
 gtk_list_store_iter_n_children (GtkTreeModel *tree_model,
                                GtkTreeIter  *iter)
 {
@@ -780,7 +780,7 @@ static gboolean
 gtk_list_store_iter_nth_child (GtkTreeModel *tree_model,
                               GtkTreeIter  *iter,
                               GtkTreeIter  *parent,
-                              gint          n)
+                              int           n)
 {
   GtkListStore *list_store = GTK_LIST_STORE (tree_model);
   GtkListStorePrivate *priv = list_store->priv;
@@ -814,14 +814,14 @@ gtk_list_store_iter_parent (GtkTreeModel *tree_model,
 static gboolean
 gtk_list_store_real_set_value (GtkListStore *list_store,
                               GtkTreeIter  *iter,
-                              gint          column,
+                              int           column,
                               GValue       *value,
                               gboolean      sort)
 {
   GtkListStorePrivate *priv = list_store->priv;
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
-  gint old_column = column;
+  int old_column = column;
   GValue real_value = G_VALUE_INIT;
   gboolean converted = FALSE;
   gboolean retval = FALSE;
@@ -924,7 +924,7 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
 void
 gtk_list_store_set_value (GtkListStore *list_store,
                          GtkTreeIter  *iter,
-                         gint          column,
+                         int           column,
                          GValue       *value)
 {
   GtkListStorePrivate *priv;
@@ -976,12 +976,12 @@ gtk_list_store_set_vector_internal (GtkListStore *list_store,
                                    GtkTreeIter  *iter,
                                    gboolean     *emit_signal,
                                    gboolean     *maybe_need_sort,
-                                   gint         *columns,
+                                   int          *columns,
                                    GValue       *values,
-                                   gint          n_values)
+                                   int           n_values)
 {
   GtkListStorePrivate *priv = list_store->priv;
-  gint i;
+  int i;
   GtkTreeIterCompareFunc func = NULL;
 
   func = gtk_list_store_get_compare_func (list_store);
@@ -1010,10 +1010,10 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
                                    va_list       var_args)
 {
   GtkListStorePrivate *priv = list_store->priv;
-  gint column;
+  int column;
   GtkTreeIterCompareFunc func = NULL;
 
-  column = va_arg (var_args, gint);
+  column = va_arg (var_args, int);
 
   func = gtk_list_store_get_compare_func (list_store);
   if (func != _gtk_tree_data_list_compare_func)
@@ -1056,7 +1056,7 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
 
       g_value_unset (&value);
 
-      column = va_arg (var_args, gint);
+      column = va_arg (var_args, int);
     }
 }
 
@@ -1077,9 +1077,9 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store,
 void
 gtk_list_store_set_valuesv (GtkListStore *list_store,
                            GtkTreeIter  *iter,
-                           gint         *columns,
+                           int          *columns,
                            GValue       *values,
-                           gint          n_values)
+                           int           n_values)
 {
   GtkListStorePrivate *priv;
   gboolean emit_signal = FALSE;
@@ -1244,13 +1244,13 @@ gtk_list_store_remove (GtkListStore *list_store,
 void
 gtk_list_store_insert (GtkListStore *list_store,
                       GtkTreeIter  *iter,
-                      gint          position)
+                      int           position)
 {
   GtkListStorePrivate *priv;
   GtkTreePath *path;
   GSequence *seq;
   GSequenceIter *ptr;
-  gint length;
+  int length;
 
   g_return_if_fail (GTK_IS_LIST_STORE (list_store));
   g_return_if_fail (iter != NULL);
@@ -1576,7 +1576,7 @@ gtk_list_store_drag_data_received (GtkTreeDragDest *drag_dest,
           GtkTreeDataList *copy_prev = NULL;
           GtkTreeDataList *copy_iter = NULL;
          GtkTreePath *path;
-          gint col;
+          int col;
 
           col = 0;
           while (dl)
@@ -1624,7 +1624,7 @@ gtk_list_store_row_drop_possible (GtkTreeDragDest  *drag_dest,
                                   GtkTreePath      *dest_path,
                                   const GValue     *value)
 {
-  gint *indices;
+  int *indices;
   GtkTreeModel *src_model = NULL;
   GtkTreePath *src_path = NULL;
   gboolean retval = FALSE;
@@ -1661,14 +1661,14 @@ gtk_list_store_row_drop_possible (GtkTreeDragDest  *drag_dest,
 /* Sorting and reordering */
 
 /* Reordering */
-static gint
+static int
 gtk_list_store_reorder_func (GSequenceIter *a,
                             GSequenceIter *b,
                             gpointer       user_data)
 {
   GHashTable *new_positions = user_data;
-  gint apos = GPOINTER_TO_INT (g_hash_table_lookup (new_positions, a));
-  gint bpos = GPOINTER_TO_INT (g_hash_table_lookup (new_positions, b));
+  int apos = GPOINTER_TO_INT (g_hash_table_lookup (new_positions, a));
+  int bpos = GPOINTER_TO_INT (g_hash_table_lookup (new_positions, b));
 
   if (apos < bpos)
     return -1;
@@ -1690,14 +1690,14 @@ gtk_list_store_reorder_func (GSequenceIter *a,
  **/
 void
 gtk_list_store_reorder (GtkListStore *store,
-                       gint         *new_order)
+                       int          *new_order)
 {
   GtkListStorePrivate *priv;
-  gint i;
+  int i;
   GtkTreePath *path;
   GHashTable *new_positions;
   GSequenceIter *ptr;
-  gint *order;
+  int *order;
   
   g_return_if_fail (GTK_IS_LIST_STORE (store));
   g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
@@ -1705,7 +1705,7 @@ gtk_list_store_reorder (GtkListStore *store,
 
   priv = store->priv;
 
-  order = g_new (gint, g_sequence_get_length (priv->seq));
+  order = g_new (int, g_sequence_get_length (priv->seq));
   for (i = 0; i < g_sequence_get_length (priv->seq); i++)
     order[new_order[i]] = i;
   
@@ -1787,7 +1787,7 @@ gtk_list_store_swap (GtkListStore *store,
 {
   GtkListStorePrivate *priv;
   GHashTable *old_positions;
-  gint *order;
+  int *order;
   GtkTreePath *path;
 
   g_return_if_fail (GTK_IS_LIST_STORE (store));
@@ -1817,12 +1817,12 @@ gtk_list_store_swap (GtkListStore *store,
 static void
 gtk_list_store_move_to (GtkListStore *store,
                        GtkTreeIter  *iter,
-                       gint          new_pos)
+                       int           new_pos)
 {
   GtkListStorePrivate *priv = store->priv;
   GHashTable *old_positions;
   GtkTreePath *path;
-  gint *order;
+  int *order;
 
   old_positions = save_positions (priv->seq);
 
@@ -1852,7 +1852,7 @@ gtk_list_store_move_before (GtkListStore *store,
                             GtkTreeIter  *iter,
                            GtkTreeIter  *position)
 {
-  gint pos;
+  int pos;
   
   g_return_if_fail (GTK_IS_LIST_STORE (store));
   g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
@@ -1883,7 +1883,7 @@ gtk_list_store_move_after (GtkListStore *store,
                           GtkTreeIter  *iter,
                           GtkTreeIter  *position)
 {
-  gint pos;
+  int pos;
   
   g_return_if_fail (GTK_IS_LIST_STORE (store));
   g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
@@ -1900,7 +1900,7 @@ gtk_list_store_move_after (GtkListStore *store,
 }
     
 /* Sorting */
-static gint
+static int
 gtk_list_store_compare_func (GSequenceIter *a,
                             GSequenceIter *b,
                             gpointer      user_data)
@@ -1909,7 +1909,7 @@ gtk_list_store_compare_func (GSequenceIter *a,
   GtkListStorePrivate *priv = list_store->priv;
   GtkTreeIter iter_a;
   GtkTreeIter iter_b;
-  gint retval;
+  int retval;
   GtkTreeIterCompareFunc func;
   gpointer data;
 
@@ -1957,7 +1957,7 @@ static void
 gtk_list_store_sort (GtkListStore *list_store)
 {
   GtkListStorePrivate *priv = list_store->priv;
-  gint *new_order;
+  int *new_order;
   GtkTreePath *path;
   GHashTable *old_positions;
 
@@ -2005,7 +2005,7 @@ iter_is_sorted (GtkListStore *list_store,
 static void
 gtk_list_store_sort_iter_changed (GtkListStore *list_store,
                                  GtkTreeIter  *iter,
-                                 gint          column)
+                                 int           column)
 
 {
   GtkListStorePrivate *priv = list_store->priv;
@@ -2018,7 +2018,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
   if (!iter_is_sorted (list_store, iter))
     {
       GHashTable *old_positions;
-      gint *order;
+      int *order;
 
       old_positions = save_positions (priv->seq);
       g_sequence_sort_changed_iter (iter->user_data,
@@ -2035,7 +2035,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
 
 static gboolean
 gtk_list_store_get_sort_column_id (GtkTreeSortable  *sortable,
-                                  gint             *sort_column_id,
+                                  int              *sort_column_id,
                                   GtkSortType      *order)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
@@ -2055,7 +2055,7 @@ gtk_list_store_get_sort_column_id (GtkTreeSortable  *sortable,
 
 static void
 gtk_list_store_set_sort_column_id (GtkTreeSortable  *sortable,
-                                  gint              sort_column_id,
+                                  int               sort_column_id,
                                   GtkSortType       order)
 {
   GtkListStore *list_store = GTK_LIST_STORE (sortable);
@@ -2095,7 +2095,7 @@ gtk_list_store_set_sort_column_id (GtkTreeSortable  *sortable,
 
 static void
 gtk_list_store_set_sort_func (GtkTreeSortable        *sortable,
-                             gint                    sort_column_id,
+                             int                     sort_column_id,
                              GtkTreeIterCompareFunc  func,
                              gpointer                data,
                              GDestroyNotify          destroy)
@@ -2185,7 +2185,7 @@ gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
 void
 gtk_list_store_insert_with_values (GtkListStore *list_store,
                                   GtkTreeIter  *iter,
-                                  gint          position,
+                                  int           position,
                                   ...)
 {
   GtkListStorePrivate *priv;
@@ -2193,7 +2193,7 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,
   GSequence *seq;
   GSequenceIter *ptr;
   GtkTreeIter tmp_iter;
-  gint length;
+  int length;
   gboolean changed = FALSE;
   gboolean maybe_need_sort = FALSE;
   va_list var_args;
@@ -2260,17 +2260,17 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,
 void
 gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
                                    GtkTreeIter  *iter,
-                                   gint          position,
-                                   gint         *columns, 
+                                   int           position,
+                                   int          *columns, 
                                    GValue       *values,
-                                   gint          n_values)
+                                   int           n_values)
 {
   GtkListStorePrivate *priv;
   GtkTreePath *path;
   GSequence *seq;
   GSequenceIter *ptr;
   GtkTreeIter tmp_iter;
-  gint length;
+  int length;
   gboolean changed = FALSE;
   gboolean maybe_need_sort = FALSE;
 
@@ -2337,11 +2337,11 @@ typedef struct {
   GSList *column_type_names;
   GType *column_types;
   GValue *values;
-  gint *colids;
+  int *colids;
   ColInfo **columns;
-  gint last_row;
-  gint n_columns;
-  gint row_column;
+  int last_row;
+  int n_columns;
+  int row_column;
   gboolean is_data;
   const gchar *domain;
 } SubParserData;
@@ -2358,7 +2358,7 @@ list_store_start_element (GtkBuildableParseContext *context,
 
   if (strcmp (element_name, "col") == 0)
     {
-      gint id = -1;
+      int id = -1;
       const gchar *id_str;
       const gchar *msg_context = NULL;
       gboolean translatable = FALSE;
@@ -2537,7 +2537,7 @@ list_store_text (GtkBuildableParseContext  *context,
                  GError                   **error)
 {
   SubParserData *data = (SubParserData*)user_data;
-  gint i;
+  int i;
   gchar *string;
   ColInfo *info;
 
@@ -2608,7 +2608,7 @@ gtk_list_store_buildable_custom_tag_start (GtkBuildable       *buildable,
     }
   else if (strcmp (tagname, "data") == 0)
     {
-      gint n_columns = gtk_list_store_get_n_columns (GTK_TREE_MODEL (buildable));
+      int n_columns = gtk_list_store_get_n_columns (GTK_TREE_MODEL (buildable));
       if (n_columns == 0)
         g_error ("Cannot append data to an empty model");
 
@@ -2616,7 +2616,7 @@ gtk_list_store_buildable_custom_tag_start (GtkBuildable       *buildable,
       data->builder = builder;
       data->object = G_OBJECT (buildable);
       data->values = g_new0 (GValue, n_columns);
-      data->colids = g_new0 (gint, n_columns);
+      data->colids = g_new0 (int, n_columns);
       data->columns = g_new0 (ColInfo*, n_columns);
       data->column_types = GTK_LIST_STORE (buildable)->priv->column_headers;
       data->n_columns = n_columns;
index 6a9ae2bb7cca8c4a8abf1e5e169a39ca2de56570..7320d572baadfa4e3d4a545f7d8632709f90238b 100644 (file)
@@ -61,14 +61,14 @@ struct _GtkListStoreClass
 GDK_AVAILABLE_IN_ALL
 GType         gtk_list_store_get_type         (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-GtkListStore *gtk_list_store_new              (gint          n_columns,
+GtkListStore *gtk_list_store_new              (int           n_columns,
                                               ...);
 GDK_AVAILABLE_IN_ALL
-GtkListStore *gtk_list_store_newv             (gint          n_columns,
+GtkListStore *gtk_list_store_newv             (int           n_columns,
                                               GType        *types);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_column_types (GtkListStore *list_store,
-                                              gint          n_columns,
+                                              int           n_columns,
                                               GType        *types);
 
 /* NOTE: use gtk_tree_model_get to get values from a GtkListStore */
@@ -76,7 +76,7 @@ void          gtk_list_store_set_column_types (GtkListStore *list_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_value        (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
-                                              gint          column,
+                                              int           column,
                                               GValue       *value);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set              (GtkListStore *list_store,
@@ -85,9 +85,9 @@ void          gtk_list_store_set              (GtkListStore *list_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_valuesv      (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
-                                              gint         *columns,
+                                              int          *columns,
                                               GValue       *values,
-                                              gint          n_values);
+                                              int           n_values);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_set_valist       (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
@@ -98,7 +98,7 @@ gboolean      gtk_list_store_remove           (GtkListStore *list_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert           (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
-                                              gint          position);
+                                              int           position);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_before    (GtkListStore *list_store,
                                               GtkTreeIter  *iter,
@@ -110,15 +110,15 @@ void          gtk_list_store_insert_after     (GtkListStore *list_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_with_values  (GtkListStore *list_store,
                                                  GtkTreeIter  *iter,
-                                                 gint          position,
+                                                 int           position,
                                                  ...);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
                                                  GtkTreeIter  *iter,
-                                                 gint          position,
-                                                 gint         *columns,
+                                                 int           position,
+                                                 int          *columns,
                                                  GValue       *values,
-                                                 gint          n_values);
+                                                 int           n_values);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_prepend          (GtkListStore *list_store,
                                               GtkTreeIter  *iter);
@@ -132,7 +132,7 @@ gboolean      gtk_list_store_iter_is_valid    (GtkListStore *list_store,
                                                GtkTreeIter  *iter);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_reorder          (GtkListStore *store,
-                                               gint         *new_order);
+                                               int          *new_order);
 GDK_AVAILABLE_IN_ALL
 void          gtk_list_store_swap             (GtkListStore *store,
                                                GtkTreeIter  *a,
index 049ea2e0824e2fde5a619deda312697256c609dc..358690fea8743fc610b195ecc6eb5c34856a872a 100644 (file)
@@ -34,8 +34,8 @@ struct _GtkMagnifierPrivate
 {
   GdkPaintable *paintable;
   gdouble magnification;
-  gint x;
-  gint y;
+  int x;
+  int y;
   gboolean resize;
 };
 
@@ -136,7 +136,7 @@ gtk_magnifier_measure (GtkWidget      *widget,
 {
   GtkMagnifier *magnifier = GTK_MAGNIFIER (widget);
   GtkMagnifierPrivate *priv = gtk_magnifier_get_instance_private (magnifier);
-  gint size;
+  int size;
 
   if (priv->resize)
     {
index c13a85edceb0513ecd14d0ea63ff794224b22e3f..3d62da6f0431d09047e27fa78b01f70afcb21bc8 100644 (file)
 
 static GtkWindowGroup *gtk_main_get_window_group (GtkWidget   *widget);
 
-static gint pre_initialized = FALSE;
-static gint gtk_initialized = FALSE;
+static int pre_initialized = FALSE;
+static int gtk_initialized = FALSE;
 static GList *current_events = NULL;
 
 typedef struct {
@@ -314,8 +314,8 @@ gtk_check_version (guint required_major,
                    guint required_minor,
                    guint required_micro)
 {
-  gint gtk_effective_micro = 100 * GTK_MINOR_VERSION + GTK_MICRO_VERSION;
-  gint required_effective_micro = 100 * required_minor + required_micro;
+  int gtk_effective_micro = 100 * GTK_MINOR_VERSION + GTK_MICRO_VERSION;
+  int required_effective_micro = 100 * required_minor + required_micro;
 
   if (required_major > GTK_MAJOR_VERSION)
     return "GTK version too old (major mismatch)";
@@ -688,7 +688,7 @@ do_post_parse_initialization (void)
 guint
 gtk_get_display_debug_flags (GdkDisplay *display)
 {
-  gint i;
+  int i;
 
   if (display == NULL)
     display = gdk_display_get_default ();
@@ -712,7 +712,7 @@ void
 gtk_set_display_debug_flags (GdkDisplay *display,
                              guint       flags)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < N_DEBUG_DISPLAYS; i++)
     {
@@ -763,7 +763,7 @@ gtk_set_debug_flags (guint flags)
 gboolean
 gtk_simulate_touchscreen (void)
 {
-  static gint test_touchscreen;
+  static int test_touchscreen;
 
   if (test_touchscreen == 0)
     test_touchscreen = g_getenv ("GTK_TEST_TOUCHSCREEN") != NULL ? 1 : -1;
@@ -1996,7 +1996,7 @@ gtk_propagate_event_internal (GtkWidget *widget,
                               GdkEvent  *event,
                               GtkWidget *topmost)
 {
-  gint handled_event = FALSE;
+  int handled_event = FALSE;
   GtkWidget *target = widget;
   GtkWidgetStack widget_array;
   int i;
index e6c2606c50ce504b6182d80e703b31098582dac8..d673c2e7d59fd5076594a0eb5a4027fcd1b68ea0 100644 (file)
@@ -6,11 +6,11 @@
 #   BOOLEAN     for boolean types (gboolean)
 #   CHAR        for signed char types (gchar)
 #   UCHAR       for unsigned char types (guchar)
-#   INT         for signed integer types (gint)
+#   INT         for signed integer types (int)
 #   UINT        for unsigned integer types (guint)
 #   LONG        for signed long integer types (glong)
 #   ULONG       for unsigned long integer types (gulong)
-#   ENUM        for enumeration types (gint)
+#   ENUM        for enumeration types (int)
 #   FLAGS       for flag enumeration types (guint)
 #   FLOAT       for single-precision float types (gfloat)
 #   DOUBLE      for double-precision float types (gdouble)
index 09c12305952094914071c641f437d5be1c534a61..60a1a6d1c935f417088ae284553fa5ec53068e91 100644 (file)
@@ -1178,7 +1178,7 @@ gtk_media_stream_gerror (GtkMediaStream *self,
 void
 gtk_media_stream_error (GtkMediaStream *self,
                         GQuark          domain,
-                        gint            code,
+                        int             code,
                         const gchar    *format,
                         ...)
 {
@@ -1212,7 +1212,7 @@ gtk_media_stream_error (GtkMediaStream *self,
 void
 gtk_media_stream_error_valist (GtkMediaStream *self,
                                GQuark          domain,
-                               gint            code,
+                               int             code,
                                const gchar    *format,
                                va_list         args)
 {
index 9f17a6638a2bade1929e33ebaa768fa7fd78c04f..72d7f4ddd169a9180f3f78962db6c37a26a5c40e 100644 (file)
@@ -140,13 +140,13 @@ void                    gtk_media_stream_gerror                 (GtkMediaStream
 GDK_AVAILABLE_IN_ALL
 void                    gtk_media_stream_error                  (GtkMediaStream *self,
                                                                  GQuark          domain,
-                                                                 gint            code,
+                                                                 int             code,
                                                                  const gchar    *format,
                                                                  ...) G_GNUC_PRINTF (4, 5);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_media_stream_error_valist           (GtkMediaStream *self,
                                                                  GQuark          domain,
-                                                                 gint            code,
+                                                                 int             code,
                                                                  const gchar    *format,
                                                                  va_list         args) G_GNUC_PRINTF (4, 0);
 
index f01450246062b18473f76e747e3c2df7fc450c76..01c1a4a8d25fe352c0a7238f2336e4c8f1e9f05e 100644 (file)
@@ -48,14 +48,14 @@ struct _GtkMenuSectionBox
   gboolean             iconic;
   gboolean             inline_buttons;
   gboolean             circular;
-  gint                 depth;
+  int                  depth;
   GtkPopoverMenuFlags  flags;
   GtkSizeGroup        *indicators;
 };
 
 typedef struct
 {
-  gint     n_items;
+  int      n_items;
   gboolean previous_is_iconic;
 } MenuData;
 
@@ -91,7 +91,7 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box,
   gboolean has_separator;
   gboolean has_label;
   gboolean separator_condition;
-  gint n_items_before;
+  int n_items_before;
   GtkWidget *child;
 
   n_items_before =  data->n_items;
@@ -203,7 +203,7 @@ gtk_popover_item_activate (GtkWidget *button,
 }
 
 static void
-gtk_menu_section_box_remove_func (gint     position,
+gtk_menu_section_box_remove_func (int      position,
                                   gpointer user_data)
 {
   GtkMenuSectionBox *box = user_data;
@@ -291,7 +291,7 @@ open_submenu (GtkWidget *button,
 
 static void
 gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
-                                  gint                position,
+                                  int                 position,
                                   gpointer            user_data)
 {
   GtkMenuSectionBox *box = user_data;
index c9b59d183bf42715b6aff9f867bf2ff888ddac87..ba3bbfc6aab44cb155fcb60cfce1c185a7cfc014 100644 (file)
@@ -87,14 +87,14 @@ static GtkMenuTrackerSection *  gtk_menu_tracker_section_new    (GtkMenuTracker
                                                                  GMenuModel            *model,
                                                                  gboolean               with_separators,
                                                                  gboolean               separator_label,
-                                                                 gint                   offset,
+                                                                 int                    offset,
                                                                  const gchar           *action_namespace);
 static void                    gtk_menu_tracker_section_free    (GtkMenuTrackerSection *section);
 
 static GtkMenuTrackerSection *
 gtk_menu_tracker_section_find_model (GtkMenuTrackerSection *section,
                                      gpointer               model,
-                                     gint                  *offset)
+                                     int                   *offset)
 {
   GSList *item;
 
@@ -159,18 +159,18 @@ gtk_menu_tracker_section_find_model (GtkMenuTrackerSection *section,
  * have any items in us or if we are completely empty and sync if our
  * separator is shown or not.
  */
-static gint
+static int
 gtk_menu_tracker_section_sync_separators (GtkMenuTrackerSection *section,
                                           GtkMenuTracker        *tracker,
-                                          gint                   offset,
+                                          int                    offset,
                                           gboolean               could_have_separator,
                                           GMenuModel            *parent_model,
-                                          gint                   parent_index)
+                                          int                    parent_index)
 {
   gboolean should_have_separator;
-  gint n_items = 0;
+  int n_items = 0;
   GSList *item;
-  gint i = 0;
+  int i = 0;
 
   for (item = section->items; item; item = item->next)
     {
@@ -228,7 +228,7 @@ gtk_menu_tracker_item_visibility_changed (GtkMenuTrackerItem *item,
   GtkMenuTrackerSection *section;
   gboolean is_now_visible;
   gboolean was_visible;
-  gint offset = 0;
+  int offset = 0;
 
   is_now_visible = gtk_menu_tracker_item_get_is_visible (item);
 
@@ -255,11 +255,11 @@ gtk_menu_tracker_item_visibility_changed (GtkMenuTrackerItem *item,
   gtk_menu_tracker_section_sync_separators (tracker->toplevel, tracker, 0, FALSE, NULL, 0);
 }
 
-static gint
+static int
 gtk_menu_tracker_section_measure (GtkMenuTrackerSection *section)
 {
   GSList *item;
-  gint n_items;
+  int n_items;
 
   if (section == NULL)
     return 1;
@@ -278,15 +278,15 @@ gtk_menu_tracker_section_measure (GtkMenuTrackerSection *section)
 static void
 gtk_menu_tracker_remove_items (GtkMenuTracker  *tracker,
                                GSList         **change_point,
-                               gint             offset,
-                               gint             n_items)
+                               int              offset,
+                               int              n_items)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < n_items; i++)
     {
       GtkMenuTrackerSection *subsection;
-      gint n;
+      int n;
 
       subsection = (*change_point)->data;
       *change_point = g_slist_delete_link (*change_point, *change_point);
@@ -303,10 +303,10 @@ static void
 gtk_menu_tracker_add_items (GtkMenuTracker         *tracker,
                             GtkMenuTrackerSection  *section,
                             GSList                **change_point,
-                            gint                    offset,
+                            int                     offset,
                             GMenuModel             *model,
-                            gint                    position,
-                            gint                    n_items)
+                            int                     position,
+                            int                     n_items)
 {
   while (n_items--)
     {
@@ -410,16 +410,16 @@ gtk_menu_tracker_add_items (GtkMenuTracker         *tracker,
 
 static void
 gtk_menu_tracker_model_changed (GMenuModel *model,
-                                gint        position,
-                                gint        removed,
-                                gint        added,
+                                int         position,
+                                int         removed,
+                                int         added,
                                 gpointer    user_data)
 {
   GtkMenuTracker *tracker = user_data;
   GtkMenuTrackerSection *section;
   GSList **change_point;
-  gint offset = 0;
-  gint i;
+  int offset = 0;
+  int i;
 
   /* First find which section the changed model corresponds to, and the
    * position of that section within the overall menu.
@@ -477,7 +477,7 @@ gtk_menu_tracker_section_new (GtkMenuTracker *tracker,
                               GMenuModel     *model,
                               gboolean        with_separators,
                               gboolean        separator_label,
-                              gint            offset,
+                              int             offset,
                               const gchar    *action_namespace)
 {
   GtkMenuTrackerSection *section;
index 64b898917d7303f58cfa600f94b40b64c25724d3..2cf2effa8ad183be8255806112f99140bf6d516e 100644 (file)
@@ -483,7 +483,7 @@ gtk_menu_tracker_item_init_observer_iface (GtkActionObserverInterface *iface)
 GtkMenuTrackerItem *
 _gtk_menu_tracker_item_new (GtkActionObservable *observable,
                             GMenuModel          *model,
-                            gint                 item_index,
+                            int                  item_index,
                             gboolean             mac_os_mode,
                             const gchar         *action_namespace,
                             gboolean             is_separator)
index 0e08f7ecb3977f202f284dc12970b0c9cf8b6aa6..2b81866314e748e9115009fcbf1d317b5fa14548 100644 (file)
@@ -44,7 +44,7 @@ GType                   gtk_menu_tracker_item_role_get_type             (void) G
 
 GtkMenuTrackerItem *   _gtk_menu_tracker_item_new                       (GtkActionObservable *observable,
                                                                          GMenuModel          *model,
-                                                                         gint                 item_index,
+                                                                         int                  item_index,
                                                                          gboolean             mac_os_mode,
                                                                          const gchar         *action_namespace,
                                                                          gboolean             is_separator);
index 210fe2d255efd470e6bb7402cedcd671414d7dc7..92a0f47739aceffa833b80a0a634440990a5a170 100644 (file)
 typedef struct _GtkMenuTracker GtkMenuTracker;
 
 typedef void         (* GtkMenuTrackerInsertFunc)                       (GtkMenuTrackerItem       *item,
-                                                                         gint                      position,
+                                                                         int                       position,
                                                                          gpointer                  user_data);
 
-typedef void         (* GtkMenuTrackerRemoveFunc)                       (gint                      position,
+typedef void         (* GtkMenuTrackerRemoveFunc)                       (int                       position,
                                                                          gpointer                  user_data);
 
 
index e3f057c1252299435c8eaba6a70c20b00a1491b9..c6d81cbd4bcc69fc19145bca95a460d0c751ebbc 100644 (file)
@@ -150,7 +150,7 @@ _gtk_get_module_path (const gchar *type)
   gchar **paths = get_module_path();
   gchar **path;
   gchar **result;
-  gint count = 0;
+  int count = 0;
 
   for (path = paths; *path; path++)
     count++;
@@ -160,7 +160,7 @@ _gtk_get_module_path (const gchar *type)
   count = 0;
   for (path = get_module_path (); *path; path++)
     {
-      gint use_version, use_host;
+      int use_version, use_host;
       
       for (use_version = TRUE; use_version >= FALSE; use_version--)
        for (use_host = TRUE; use_host >= FALSE; use_host--)
index 30ecb9d0c8769df48bea3ca654d45bf6702a17d4..be8472a016201ccf15fb1717b62f077d1a954f88 100644 (file)
@@ -44,7 +44,7 @@ _gtk_mount_operation_lookup_context_free (GtkMountOperationLookupContext *contex
 gboolean
 _gtk_mount_operation_lookup_info (GtkMountOperationLookupContext *context,
                                   GPid                            pid,
-                                  gint                            size_pixels,
+                                  int                             size_pixels,
                                   gchar                         **out_name,
                                   gchar                         **out_command_line,
                                   GdkTexture                    **out_texture)
index 678d54c64af67e4b1ea6fa5bf97764a9ffe7dd90..5d2f10c01b9c5136ae2e0afbb1aedaf55a15605f 100644 (file)
@@ -521,7 +521,7 @@ get_window_list (GdkDisplay *display,
 
 struct _GtkMountOperationLookupContext
 {
-  /* Hash from pid (gint) -> XID (gint)
+  /* Hash from pid (int) -> XID (int)
    *
    * Note that XIDs are at most 27 bits - however, also note that sizeof(XID) == 8 on
    * x86_64 - that's just xlib brokenness. So it's safe to stuff the XID into a pointer.
@@ -535,8 +535,8 @@ _gtk_mount_operation_lookup_context_get (GdkDisplay *display)
 {
   GtkMountOperationLookupContext *context;
   Window *mapping;
-  gint mapping_length;
-  gint n;
+  int mapping_length;
+  int n;
 
   context = g_new0 (GtkMountOperationLookupContext, 1);
 
@@ -554,7 +554,7 @@ _gtk_mount_operation_lookup_context_get (GdkDisplay *display)
                    &mapping_length);
   for (n = 0; n < mapping_length; n++)
     {
-      gint pid;
+      int pid;
 
       if (!get_cardinal (context->display,
                          GDK_DISPLAY_XDISPLAY (context->display),
@@ -566,7 +566,7 @@ _gtk_mount_operation_lookup_context_get (GdkDisplay *display)
 
       g_hash_table_insert (context->pid_to_window,
                            GINT_TO_POINTER (pid),
-                           GINT_TO_POINTER ((gint) mapping[n]));
+                           GINT_TO_POINTER ((int) mapping[n]));
     }
   g_free (mapping);
 
@@ -928,7 +928,7 @@ get_name_for_window_with_pid (GtkMountOperationLookupContext *context,
 static GdkTexture *
 get_texture_for_window_with_pid (GtkMountOperationLookupContext *context,
                                  GPid                            pid,
-                                 gint                            size_pixels)
+                                 int                             size_pixels)
 {
   Window window;
   GdkTexture *ret;
@@ -954,8 +954,8 @@ get_texture_for_window_with_pid (GtkMountOperationLookupContext *context,
 
   if (window != None)
     {
-      gint    width;
-      gint    height;
+      int     width;
+      int     height;
       guchar *pixdata;
 
       if (read_rgb_icon (context->display,
@@ -992,7 +992,7 @@ static const gchar *well_known_commands[] =
 gboolean
 _gtk_mount_operation_lookup_info (GtkMountOperationLookupContext *context,
                                   GPid                            pid,
-                                  gint                            size_pixels,
+                                  int                             size_pixels,
                                   gchar                         **out_name,
                                   gchar                         **out_command_line,
                                   GdkTexture                    **out_texture)
index cfaa834b9cd76fb5fab65ed31192d177ecda1418..a54d109f5882a70b761d4035db09b2917df33c05 100644 (file)
@@ -338,7 +338,7 @@ remember_button_toggled (GtkToggleButton   *button,
 
 static void
 pw_dialog_got_response (GtkDialog         *dialog,
-                        gint               response_id,
+                        int                response_id,
                         GtkMountOperation *mount_op)
 {
   GtkMountOperationPrivate *priv = mount_op->priv;
@@ -910,7 +910,7 @@ gtk_mount_operation_ask_password (GMountOperation   *mount_op,
 
 static void
 question_dialog_button_clicked (GtkDialog       *dialog,
-                                gint             button_number,
+                                int              button_number,
                                 GMountOperation *op)
 {
   GtkMountOperationPrivate *priv;
@@ -1065,7 +1065,7 @@ gtk_mount_operation_ask_question (GMountOperation *op,
 
 static void
 show_processes_button_clicked (GtkDialog       *dialog,
-                               gint             button_number,
+                               int              button_number,
                                GMountOperation *op)
 {
   GtkMountOperationPrivate *priv;
@@ -1088,7 +1088,7 @@ show_processes_button_clicked (GtkDialog       *dialog,
   g_object_unref (op);
 }
 
-static gint
+static int
 pid_equal (gconstpointer a,
            gconstpointer b)
 {
@@ -1107,7 +1107,7 @@ diff_sorted_arrays (GArray         *array1,
                     GArray         *added_indices,
                     GArray         *removed_indices)
 {
-  gint order;
+  int order;
   guint n1, n2;
   guint elem_size;
 
@@ -1289,8 +1289,8 @@ update_process_list_store (GtkMountOperation *mount_operation,
    * items as appropriate
    */
   current_pids = g_array_new (FALSE, FALSE, sizeof (GPid));
-  pid_indices_to_add = g_array_new (FALSE, FALSE, sizeof (gint));
-  pid_indices_to_remove = g_array_new (FALSE, FALSE, sizeof (gint));
+  pid_indices_to_add = g_array_new (FALSE, FALSE, sizeof (int));
+  pid_indices_to_remove = g_array_new (FALSE, FALSE, sizeof (int));
 
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter))
     {
@@ -1445,8 +1445,8 @@ do_popup_menu_for_process_tree_view (GtkWidget         *widget,
 
       gdk_event_get_position (event, &x, &y);
       if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (op->priv->process_tree_view),
-                                         (gint) x,
-                                         (gint) y,
+                                         (int) x,
+                                         (int) y,
                                          &path,
                                          NULL,
                                          NULL,
index 40b63e9ae9bac7472c01b921b2fdb8687b9cc06c..77509463688f759e83052a428274142d2e4cf718 100644 (file)
@@ -37,7 +37,7 @@ GtkMountOperationLookupContext *_gtk_mount_operation_lookup_context_get  (GdkDis
 
 gboolean _gtk_mount_operation_lookup_info         (GtkMountOperationLookupContext *context,
                                                    GPid                            pid,
-                                                   gint                            size_pixels,
+                                                   int                             size_pixels,
                                                    gchar                         **out_name,
                                                    gchar                         **out_command_line,
                                                    GdkTexture                    **out_texture);
index eed21777fd87688a36999924a566d0697525b0be..3fad9880fc11737a78c9c4e9864f2306bc49089c 100644 (file)
@@ -66,7 +66,7 @@ struct _GtkNativeDialogPrivate
   guint modal : 1;
 
   /* Run state */
-  gint run_response_id;
+  int run_response_id;
   GMainLoop *run_loop; /* Non-NULL when in run */
 };
 
index f6a2dc20ae8f1de01a23dc3ce80bf23dbd38d6eb..09f8546f19b764280131616bf28b7bd92ac1db94 100644 (file)
@@ -36,7 +36,7 @@ struct _GtkNativeDialogClass
 {
   GObjectClass parent_class;
 
-  void (* response) (GtkNativeDialog *self, gint response_id);
+  void (* response) (GtkNativeDialog *self, int response_id);
 
   /* <private> */
   void (* show) (GtkNativeDialog *self);
index 2b7e54f332bc79df3cb6788e4e47b07d79b7845a..b0c6cacedb0bfedfce162ce57ecca19bc332d951 100644 (file)
@@ -192,18 +192,18 @@ struct _GtkNotebookClass
   gboolean (* focus_tab)       (GtkNotebook       *notebook,
                                 GtkNotebookTab     type);
   gboolean (* change_current_page) (GtkNotebook   *notebook,
-                                gint               offset);
+                                int                offset);
   void (* move_focus_out)      (GtkNotebook       *notebook,
                                 GtkDirectionType   direction);
   gboolean (* reorder_tab)     (GtkNotebook       *notebook,
                                 GtkDirectionType   direction,
                                 gboolean           move_to_last);
   /* More vfuncs */
-  gint (* insert_page)         (GtkNotebook       *notebook,
+  int (* insert_page)          (GtkNotebook       *notebook,
                                 GtkWidget         *child,
                                 GtkWidget         *tab_label,
                                 GtkWidget         *menu_label,
-                                gint               position);
+                                int                position);
 
   GtkNotebook * (* create_window) (GtkNotebook    *notebook,
                                    GtkWidget      *page);
@@ -243,15 +243,15 @@ struct _GtkNotebook
   GList         *first_tab;             /* The first tab visible (for scrolling notebooks) */
   GList         *focus_tab;
 
-  gint           drag_begin_x;
-  gint           drag_begin_y;
-  gint           drag_offset_x;
-  gint           drag_offset_y;
-  gint           drag_surface_x;
-  gint           drag_surface_y;
-  gint           mouse_x;
-  gint           mouse_y;
-  gint           pressed_button;
+  int            drag_begin_x;
+  int            drag_begin_y;
+  int            drag_offset_x;
+  int            drag_offset_y;
+  int            drag_surface_x;
+  int            drag_surface_y;
+  int            mouse_x;
+  int            mouse_y;
+  int            pressed_button;
 
   GQuark         group;
 
@@ -741,7 +741,7 @@ static gboolean gtk_notebook_select_page         (GtkNotebook      *notebook,
 static gboolean gtk_notebook_focus_tab           (GtkNotebook      *notebook,
                                                   GtkNotebookTab    type);
 static gboolean gtk_notebook_change_current_page (GtkNotebook      *notebook,
-                                                  gint              offset);
+                                                  int               offset);
 static void     gtk_notebook_move_focus_out      (GtkNotebook      *notebook,
                                                   GtkDirectionType  direction_type);
 static gboolean gtk_notebook_reorder_tab         (GtkNotebook      *notebook,
@@ -801,22 +801,22 @@ static void gtk_notebook_remove              (GtkNotebook      *notebook,
                                               GtkWidget        *widget);
 
 /*** GtkNotebook Methods ***/
-static gint gtk_notebook_real_insert_page    (GtkNotebook      *notebook,
+static int gtk_notebook_real_insert_page     (GtkNotebook      *notebook,
                                               GtkWidget        *child,
                                               GtkWidget        *tab_label,
                                               GtkWidget        *menu_label,
-                                              gint              position);
+                                              int               position);
 
 static GtkNotebook *gtk_notebook_create_window (GtkNotebook    *notebook,
                                                 GtkWidget      *page);
 
 static void gtk_notebook_measure_tabs        (GtkGizmo         *gizmo,
                                               GtkOrientation    orientation,
-                                              gint              for_size,
-                                              gint             *minimum,
-                                              gint             *natural,
-                                              gint             *minimum_baseline,
-                                              gint             *natural_baseline);
+                                              int               for_size,
+                                              int              *minimum,
+                                              int              *natural,
+                                              int              *minimum_baseline,
+                                              int              *natural_baseline);
 static void gtk_notebook_allocate_tabs       (GtkGizmo         *gizmo,
                                               int               width,
                                               int               height,
@@ -828,21 +828,21 @@ static void     gtk_notebook_snapshot_tabs   (GtkGizmo         *gizmo,
 static void gtk_notebook_real_remove         (GtkNotebook      *notebook,
                                               GList            *list);
 static void gtk_notebook_update_labels       (GtkNotebook      *notebook);
-static gint gtk_notebook_timer               (GtkNotebook      *notebook);
+static int gtk_notebook_timer                (GtkNotebook      *notebook);
 static void gtk_notebook_set_scroll_timer    (GtkNotebook *notebook);
-static gint gtk_notebook_page_compare        (gconstpointer     a,
+static int gtk_notebook_page_compare         (gconstpointer     a,
                                               gconstpointer     b);
 static GList* gtk_notebook_find_child        (GtkNotebook      *notebook,
                                               GtkWidget        *child);
 static GList * gtk_notebook_search_page      (GtkNotebook      *notebook,
                                               GList            *list,
-                                              gint              direction,
+                                              int               direction,
                                               gboolean          find_visible);
 static void  gtk_notebook_child_reordered    (GtkNotebook      *notebook,
                                               GtkNotebookPage  *page);
-static gint gtk_notebook_insert_notebook_page (GtkNotebook     *notebook,
-                                               GtkNotebookPage *page,
-                                               int              position);
+static int gtk_notebook_insert_notebook_page (GtkNotebook     *notebook,
+                                              GtkNotebookPage *page,
+                                              int              position);
 
 /*** GtkNotebook Size Allocate Functions ***/
 static void gtk_notebook_pages_allocate      (GtkNotebook      *notebook,
@@ -851,7 +851,7 @@ static void gtk_notebook_pages_allocate      (GtkNotebook      *notebook,
 static void gtk_notebook_calc_tabs           (GtkNotebook      *notebook,
                                               GList            *start,
                                               GList           **end,
-                                              gint             *tab_space,
+                                              int              *tab_space,
                                               guint             direction);
 
 /*** GtkNotebook Page Switch Methods ***/
@@ -862,7 +862,7 @@ static void gtk_notebook_real_switch_page    (GtkNotebook      *notebook,
 /*** GtkNotebook Page Switch Functions ***/
 static void gtk_notebook_switch_page         (GtkNotebook      *notebook,
                                               GtkNotebookPage  *page);
-static gint gtk_notebook_page_select         (GtkNotebook      *notebook,
+static int gtk_notebook_page_select          (GtkNotebook      *notebook,
                                               gboolean          move_focus);
 static void gtk_notebook_switch_focus_tab    (GtkNotebook      *notebook,
                                               GList            *new_child);
@@ -1556,7 +1556,7 @@ gtk_notebook_focus_tab (GtkNotebook       *notebook,
 
 static gboolean
 gtk_notebook_change_current_page (GtkNotebook *notebook,
-                                  gint         offset)
+                                  int          offset)
 {
   GList *current = NULL;
 
@@ -1666,7 +1666,7 @@ gtk_notebook_move_focus_out (GtkNotebook      *notebook,
   g_object_unref (notebook);
 }
 
-static gint
+static int
 reorder_tab (GtkNotebook *notebook, GList *position, GList *tab)
 {
   GList *elem;
@@ -1714,7 +1714,7 @@ gtk_notebook_reorder_tab (GtkNotebook      *notebook,
 {
   GtkDirectionType effective_direction = get_effective_direction (notebook, direction_type);
   GList *last, *child, *element;
-  gint page_num, old_page_num, i;
+  int page_num, old_page_num, i;
 
   if (!gtk_widget_is_focus (GTK_WIDGET (notebook)) || !notebook->show_tabs)
     return FALSE;
@@ -1947,9 +1947,9 @@ gtk_notebook_unmap (GtkWidget *widget)
 static void
 gtk_notebook_distribute_arrow_width (GtkNotebook *notebook,
                                      GtkPackType  type,
-                                     gint         size,
-                                     gint        *out_left,
-                                     gint        *out_right)
+                                     int          size,
+                                     int         *out_left,
+                                     int         *out_right)
 {
   GtkRequestedSize sizes[2];
 
@@ -1991,14 +1991,14 @@ static void
 gtk_notebook_measure_arrows (GtkNotebook    *notebook,
                              GtkPackType     type,
                              GtkOrientation  orientation,
-                             gint            for_size,
-                             gint           *minimum,
-                             gint           *natural,
-                             gint           *minimum_baseline,
-                             gint           *natural_baseline)
+                             int             for_size,
+                             int            *minimum,
+                             int            *natural,
+                             int            *minimum_baseline,
+                             int            *natural_baseline)
 {
-  gint child1_min, child1_nat;
-  gint child2_min, child2_nat;
+  int child1_min, child1_nat;
+  int child2_min, child2_nat;
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     {
@@ -2035,7 +2035,7 @@ gtk_notebook_measure_arrows (GtkNotebook    *notebook,
     }
   else
     {
-      gint child1_size, child2_size;
+      int child1_size, child2_size;
 
       if (for_size > -1)
         gtk_notebook_distribute_arrow_width (notebook, type, for_size, &child1_size, &child2_size);
@@ -2079,9 +2079,9 @@ static void
 gtk_notebook_get_preferred_tabs_size (GtkNotebook    *notebook,
                                       GtkRequisition *requisition)
 {
-  gint tab_width = 0;
-  gint tab_height = 0;
-  gint tab_max = 0;
+  int tab_width = 0;
+  int tab_height = 0;
+  int tab_max = 0;
   guint vis_pages = 0;
   GList *children;
   GtkNotebookPage *page;
@@ -2144,7 +2144,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook    *notebook,
 
           if (notebook->scrollable)
             {
-              gint arrow_height, unused;
+              int arrow_height, unused;
               gtk_notebook_measure_arrows (notebook,
                                            GTK_PACK_START,
                                            GTK_ORIENTATION_VERTICAL,
@@ -2175,7 +2175,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook    *notebook,
 
           if (notebook->scrollable)
             {
-              gint start_arrow_width, end_arrow_width, unused;
+              int start_arrow_width, end_arrow_width, unused;
 
               gtk_notebook_measure_arrows (notebook,
                                            GTK_PACK_START,
@@ -2204,7 +2204,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook    *notebook,
 
           if (notebook->scrollable)
             {
-              gint arrow_width, unused;
+              int arrow_width, unused;
               gtk_notebook_measure_arrows (notebook,
                                            GTK_PACK_START,
                                            GTK_ORIENTATION_HORIZONTAL,
@@ -2236,7 +2236,7 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook    *notebook,
 
           if (notebook->scrollable)
             {
-              gint start_arrow_height, end_arrow_height, unused;
+              int start_arrow_height, end_arrow_height, unused;
 
               gtk_notebook_measure_arrows (notebook,
                                            GTK_PACK_START,
@@ -2274,11 +2274,11 @@ gtk_notebook_get_preferred_tabs_size (GtkNotebook    *notebook,
 static void
 gtk_notebook_measure_tabs (GtkGizmo       *gizmo,
                            GtkOrientation  orientation,
-                           gint            size,
-                           gint           *minimum,
-                           gint           *natural,
-                           gint           *minimum_baseline,
-                           gint           *natural_baseline)
+                           int             size,
+                           int            *minimum,
+                           int            *natural,
+                           int            *minimum_baseline,
+                           int            *natural_baseline)
 {
   GtkWidget *widget = gtk_widget_get_parent (GTK_WIDGET (gizmo));
   GtkNotebook *notebook = GTK_NOTEBOOK (gtk_widget_get_parent (widget));
@@ -2333,10 +2333,10 @@ gtk_notebook_show_arrows (GtkNotebook *notebook)
 
 static GtkNotebookArrow
 gtk_notebook_get_arrow (GtkNotebook *notebook,
-                        gint         x,
-                        gint         y)
+                        int          x,
+                        int          y)
 {
-  gint i;
+  int i;
 
   if (gtk_notebook_show_arrows (notebook))
     {
@@ -2385,7 +2385,7 @@ gtk_notebook_do_arrow (GtkNotebook     *notebook,
 static gboolean
 gtk_notebook_arrow_button_press (GtkNotebook      *notebook,
                                  GtkNotebookArrow  arrow,
-                                 gint              button)
+                                 int               button)
 {
   GtkWidget *widget = GTK_WIDGET (notebook);
   gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
@@ -2585,7 +2585,7 @@ get_drop_position (GtkNotebook *notebook)
   GList *children, *last_child;
   GtkNotebookPage *page;
   gboolean is_rtl;
-  gint x, y;
+  int x, y;
 
   x = notebook->mouse_x;
   y = notebook->mouse_y;
@@ -2685,7 +2685,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
     {
       if (notebook->operation == DRAG_OPERATION_REORDER)
         {
-          gint old_page_num, page_num, i;
+          int old_page_num, page_num, i;
           GList *element;
 
           element = get_drop_position (notebook);
@@ -2766,7 +2766,7 @@ get_pointer_position (GtkNotebook *notebook)
 {
   GtkWidget *widget = GTK_WIDGET (notebook);
   graphene_rect_t area;
-  gint width, height;
+  int width, height;
   gboolean is_rtl;
 
   if (!notebook->scrollable)
@@ -2779,7 +2779,7 @@ get_pointer_position (GtkNotebook *notebook)
   if (notebook->tab_pos == GTK_POS_TOP ||
       notebook->tab_pos == GTK_POS_BOTTOM)
     {
-      gint x = notebook->mouse_x;
+      int x = notebook->mouse_x;
 
       is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
 
@@ -2792,7 +2792,7 @@ get_pointer_position (GtkNotebook *notebook)
     }
   else
     {
-      gint y = notebook->mouse_y;
+      int y = notebook->mouse_y;
 
       if (y > height - SCROLL_THRESHOLD)
         return POINTER_AFTER;
@@ -2829,10 +2829,10 @@ scroll_notebook_timer (gpointer data)
 
 static gboolean
 check_threshold (GtkNotebook *notebook,
-                 gint         current_x,
-                 gint         current_y)
+                 int          current_x,
+                 int          current_y)
 {
-  gint dnd_threshold;
+  int dnd_threshold;
   graphene_rect_t rectangle;
   GtkSettings *settings;
 
@@ -2966,7 +2966,7 @@ gtk_notebook_motion (GtkEventController *controller,
 static void
 update_arrow_state (GtkNotebook *notebook)
 {
-  gint i;
+  int i;
   gboolean is_rtl, left;
 
   is_rtl = gtk_widget_get_direction (GTK_WIDGET (notebook)) == GTK_TEXT_DIR_RTL;
@@ -3035,7 +3035,7 @@ update_arrow_nodes (GtkNotebook *notebook)
   gboolean arrow[4];
   const char *up_icon_name;
   const char *down_icon_name;
-  gint i;
+  int i;
 
   if (notebook->tab_pos == GTK_POS_LEFT ||
       notebook->tab_pos == GTK_POS_RIGHT)
@@ -3329,7 +3329,7 @@ do_detach_tab (GtkNotebook *from,
   GtkWidget *tab_label, *menu_label;
   gboolean tab_expand, tab_fill, reorderable, detachable;
   GList *element;
-  gint page_num;
+  int page_num;
   GtkNotebookPage *page;
 
   menu_label = gtk_notebook_get_menu_label (from, child);
@@ -3390,7 +3390,7 @@ gtk_notebook_remove (GtkNotebook *notebook,
 {
   GtkNotebookPage *page;
   GList *children, *list;
-  gint page_num = 0;
+  int page_num = 0;
 
   children = notebook->children;
   while (children)
@@ -3447,7 +3447,7 @@ focus_tabs_in (GtkNotebook *notebook)
 static gboolean
 focus_tabs_move (GtkNotebook     *notebook,
                  GtkDirectionType direction,
-                 gint             search_direction)
+                 int              search_direction)
 {
   GList *new_page;
 
@@ -3479,7 +3479,7 @@ focus_child_in (GtkNotebook      *notebook,
 
 static gboolean
 focus_action_in (GtkNotebook      *notebook,
-                 gint              action,
+                 int               action,
                  GtkDirectionType  direction)
 {
   if (notebook->action_widget[action] &&
@@ -3499,8 +3499,8 @@ gtk_notebook_focus (GtkWidget        *widget,
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
   GtkWidget *old_focus_child;
   GtkDirectionType effective_direction;
-  gint first_action;
-  gint last_action;
+  int first_action;
+  int last_action;
 
   gboolean widget_is_focus;
 
@@ -3802,11 +3802,11 @@ page_visible_cb (GtkWidget  *child,
 static void
 measure_tab (GtkGizmo       *gizmo,
              GtkOrientation  orientation,
-             gint            for_size,
-             gint           *minimum,
-             gint           *natural,
-             gint           *minimum_baseline,
-             gint           *natural_baseline)
+             int             for_size,
+             int            *minimum,
+             int            *natural,
+             int            *minimum_baseline,
+             int            *natural_baseline)
 {
   GtkNotebook *notebook = g_object_get_data (G_OBJECT (gizmo), "notebook");
   GList *l;
@@ -3910,12 +3910,12 @@ gtk_notebook_tab_drop_leave (GtkEventController *controller,
   g_clear_handle_id (&notebook->switch_page_timer, g_source_remove);
 }
 
-static gint
+static int
 gtk_notebook_insert_notebook_page (GtkNotebook *notebook,
                                    GtkNotebookPage *page,
                                    int position)
 {
-  gint nchildren;
+  int nchildren;
   GList *list;
   GtkWidget *sibling;
   GtkEventController *controller;
@@ -4007,12 +4007,12 @@ gtk_notebook_insert_notebook_page (GtkNotebook *notebook,
   return gtk_notebook_page_num (notebook, page->child);
 }
 
-static gint
+static int
 gtk_notebook_real_insert_page (GtkNotebook *notebook,
                                GtkWidget   *child,
                                GtkWidget   *tab_label,
                                GtkWidget   *menu_label,
-                               gint         position)
+                               int          position)
 {
   GtkNotebookPage *page;
   int ret;
@@ -4067,7 +4067,7 @@ gtk_notebook_set_scroll_timer (GtkNotebook *notebook)
     }
 }
 
-static gint
+static int
 gtk_notebook_page_compare (gconstpointer a,
                            gconstpointer b)
 {
@@ -4121,7 +4121,7 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
 {
   GtkNotebookPage *page;
   GList * next_list;
-  gint need_resize = FALSE;
+  int need_resize = FALSE;
   GtkWidget *tab_label;
   gboolean destroying;
   int position;
@@ -4213,7 +4213,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook)
   GtkNotebookPage *page;
   GList *list;
   char string[32];
-  gint page_num = 1;
+  int page_num = 1;
 
   if (!notebook->show_tabs && !notebook->menu)
     return;
@@ -4263,7 +4263,7 @@ gtk_notebook_update_labels (GtkNotebook *notebook)
 static GList *
 gtk_notebook_search_page (GtkNotebook *notebook,
                           GList       *list,
-                          gint         direction,
+                          int          direction,
                           gboolean     find_visible)
 {
   GtkNotebookPage *page = NULL;
@@ -4321,7 +4321,7 @@ gtk_notebook_snapshot_tabs (GtkGizmo    *gizmo,
   GtkNotebookPage *page;
   GList *children;
   gboolean showarrow;
-  gint step = STEP_PREV;
+  int step = STEP_PREV;
   gboolean is_rtl;
   GtkPositionType tab_pos;
   guint i;
@@ -4442,7 +4442,7 @@ gtk_notebook_allocate_arrows (GtkNotebook   *notebook,
                               GtkAllocation *allocation)
 {
   GtkAllocation arrow_allocation;
-  gint size1, size2, min, nat;
+  int size1, size2, min, nat;
   guint i, ii;
 
   switch (notebook->tab_pos)
@@ -4545,7 +4545,7 @@ gtk_notebook_tab_space (GtkNotebook   *notebook,
                         int            notebook_height,
                         gboolean      *show_arrows,
                         GtkAllocation *tabs_allocation,
-                        gint          *tab_space)
+                        int           *tab_space)
 {
   GList *children;
   GtkPositionType tab_pos = get_effective_tab_pos (notebook);
@@ -4630,10 +4630,10 @@ static void
 gtk_notebook_calculate_shown_tabs (GtkNotebook          *notebook,
                                    gboolean              show_arrows,
                                    const GtkAllocation  *tabs_allocation,
-                                   gint                  tab_space,
+                                   int                   tab_space,
                                    GList               **last_child,
-                                   gint                 *n,
-                                   gint                 *remaining_space)
+                                   int                  *n,
+                                   int                  *remaining_space)
 {
   GList *children;
   GtkNotebookPage *page;
@@ -4794,7 +4794,7 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook          *notebook,
   else /* !show_arrows */
     {
       GtkOrientation tab_expand_orientation;
-      gint c = 0;
+      int c = 0;
       *n = 0;
 
       if (notebook->tab_pos == GTK_POS_TOP || notebook->tab_pos == GTK_POS_BOTTOM)
@@ -4830,7 +4830,7 @@ gtk_notebook_calculate_shown_tabs (GtkNotebook          *notebook,
 
 static gboolean
 get_allocate_at_bottom (GtkWidget *widget,
-                        gint       search_direction)
+                        int        search_direction)
 {
   gboolean is_rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
   GtkPositionType tab_pos = get_effective_tab_pos (GTK_NOTEBOOK (widget));
@@ -4859,17 +4859,17 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook          *notebook,
                                         GList               **children,
                                         GList                *last_child,
                                         gboolean              showarrow,
-                                        gint                  direction,
-                                        gint                 *remaining_space,
-                                        gint                 *expanded_tabs,
+                                        int                   direction,
+                                        int                  *remaining_space,
+                                        int                  *expanded_tabs,
                                         const GtkAllocation  *allocation)
 {
   GtkWidget *widget;
   GtkNotebookPage *page;
   gboolean allocate_at_bottom;
-  gint tab_extra_space;
+  int tab_extra_space;
   GtkPositionType tab_pos;
-  gint left_x, right_x, top_y, bottom_y, anchor;
+  int left_x, right_x, top_y, bottom_y, anchor;
   gboolean gap_left, packing_changed;
   GtkAllocation child_allocation;
   GtkOrientation tab_expand_orientation;
@@ -5161,8 +5161,8 @@ gtk_notebook_pages_allocate (GtkNotebook *notebook,
   GList *last_child = NULL;
   gboolean showarrow = FALSE;
   GtkAllocation tabs_allocation;
-  gint tab_space, remaining_space;
-  gint expanded_tabs;
+  int tab_space, remaining_space;
+  int expanded_tabs;
 
   if (!notebook->show_tabs || !gtk_notebook_has_current_page (notebook))
     return;
@@ -5197,7 +5197,7 @@ static void
 gtk_notebook_calc_tabs (GtkNotebook  *notebook,
                         GList        *start,
                         GList       **end,
-                        gint         *tab_space,
+                        int          *tab_space,
                         guint         direction)
 {
   GtkNotebookPage *page = NULL;
@@ -5373,7 +5373,7 @@ gtk_notebook_switch_page (GtkNotebook     *notebook,
                  page_num);
 }
 
-static gint
+static int
 gtk_notebook_page_select (GtkNotebook *notebook,
                           gboolean     move_focus)
 {
@@ -5536,7 +5536,7 @@ gtk_notebook_menu_label_unparent (GtkWidget *widget)
  * Returns: the index (starting from 0) of the appended
  *     page in the notebook, or -1 if function fails
  */
-gint
+int
 gtk_notebook_append_page (GtkNotebook *notebook,
                           GtkWidget   *child,
                           GtkWidget   *tab_label)
@@ -5567,7 +5567,7 @@ gtk_notebook_append_page (GtkNotebook *notebook,
  * Returns: the index (starting from 0) of the appended
  *     page in the notebook, or -1 if function fails
  */
-gint
+int
 gtk_notebook_append_page_menu (GtkNotebook *notebook,
                                GtkWidget   *child,
                                GtkWidget   *tab_label,
@@ -5593,7 +5593,7 @@ gtk_notebook_append_page_menu (GtkNotebook *notebook,
  * Returns: the index (starting from 0) of the prepended
  *     page in the notebook, or -1 if function fails
  */
-gint
+int
 gtk_notebook_prepend_page (GtkNotebook *notebook,
                            GtkWidget   *child,
                            GtkWidget   *tab_label)
@@ -5624,7 +5624,7 @@ gtk_notebook_prepend_page (GtkNotebook *notebook,
  * Returns: the index (starting from 0) of the prepended
  *     page in the notebook, or -1 if function fails
  */
-gint
+int
 gtk_notebook_prepend_page_menu (GtkNotebook *notebook,
                                 GtkWidget   *child,
                                 GtkWidget   *tab_label,
@@ -5652,11 +5652,11 @@ gtk_notebook_prepend_page_menu (GtkNotebook *notebook,
  * Returns: the index (starting from 0) of the inserted
  *     page in the notebook, or -1 if function fails
  */
-gint
+int
 gtk_notebook_insert_page (GtkNotebook *notebook,
                           GtkWidget   *child,
                           GtkWidget   *tab_label,
-                          gint         position)
+                          int          position)
 {
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), -1);
   g_return_val_if_fail (GTK_IS_WIDGET (child), -1);
@@ -5666,7 +5666,7 @@ gtk_notebook_insert_page (GtkNotebook *notebook,
 }
 
 
-static gint
+static int
 gtk_notebook_page_compare_tab (gconstpointer a,
                                gconstpointer b)
 {
@@ -5716,12 +5716,12 @@ gtk_notebook_mnemonic_activate_switch_page (GtkWidget *child,
  * Returns: the index (starting from 0) of the inserted
  *     page in the notebook
  */
-gint
+int
 gtk_notebook_insert_page_menu (GtkNotebook *notebook,
                                GtkWidget   *child,
                                GtkWidget   *tab_label,
                                GtkWidget   *menu_label,
-                               gint         position)
+                               int          position)
 {
   GtkNotebookClass *class;
 
@@ -5746,7 +5746,7 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
  */
 void
 gtk_notebook_remove_page (GtkNotebook *notebook,
-                          gint         page_num)
+                          int          page_num)
 {
   GList *list = NULL;
 
@@ -5778,7 +5778,7 @@ gtk_notebook_remove_page (GtkNotebook *notebook,
  *     page in the notebook. If the notebook has no pages,
  *     then -1 will be returned.
  */
-gint
+int
 gtk_notebook_get_current_page (GtkNotebook *notebook)
 {
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), -1);
@@ -5802,7 +5802,7 @@ gtk_notebook_get_current_page (GtkNotebook *notebook)
  */
 GtkWidget*
 gtk_notebook_get_nth_page (GtkNotebook *notebook,
-                           gint         page_num)
+                           int          page_num)
 {
   GtkNotebookPage *page;
   GList *list;
@@ -5831,7 +5831,7 @@ gtk_notebook_get_nth_page (GtkNotebook *notebook,
  *
  * Returns: the number of pages in the notebook
  */
-gint
+int
 gtk_notebook_get_n_pages (GtkNotebook *notebook)
 {
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), 0);
@@ -5850,12 +5850,12 @@ gtk_notebook_get_n_pages (GtkNotebook *notebook)
  * Returns: the index of the page containing @child, or
  *     -1 if @child is not in the notebook
  */
-gint
+int
 gtk_notebook_page_num (GtkNotebook      *notebook,
                        GtkWidget        *child)
 {
   GList *children;
-  gint num;
+  int num;
 
   g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), -1);
 
@@ -5892,7 +5892,7 @@ gtk_notebook_page_num (GtkNotebook      *notebook,
  */
 void
 gtk_notebook_set_current_page (GtkNotebook *notebook,
-                               gint         page_num)
+                               int          page_num)
 {
   GList *list;
 
@@ -6025,7 +6025,7 @@ gtk_notebook_set_show_tabs (GtkNotebook *notebook,
 {
   GtkNotebookPage *page;
   GList *children;
-  gint i;
+  int i;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
 
@@ -6100,7 +6100,7 @@ gtk_notebook_update_tab_pos (GtkNotebook *notebook)
     GTK_STYLE_CLASS_TOP,
     GTK_STYLE_CLASS_BOTTOM
   };
-  gint i;
+  int i;
 
   tab_pos = get_effective_tab_pos (notebook);
 
@@ -6694,13 +6694,13 @@ gtk_notebook_child_reordered (GtkNotebook     *notebook,
 void
 gtk_notebook_reorder_child (GtkNotebook *notebook,
                             GtkWidget   *child,
-                            gint         position)
+                            int          position)
 {
   GList *list, *new_list;
   GtkNotebookPage *page;
-  gint old_pos;
-  gint max_pos;
-  gint i;
+  int old_pos;
+  int max_pos;
+  int i;
 
   g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
   g_return_if_fail (GTK_IS_WIDGET (child));
index 54a0b8a8eee06ae3b3d59ce8e1054d7fd261124b..9d869fe5f8d7f31a06187bfde4913e0350b51017 100644 (file)
@@ -63,37 +63,37 @@ GType   gtk_notebook_get_type       (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkWidget * gtk_notebook_new        (void);
 GDK_AVAILABLE_IN_ALL
-gint gtk_notebook_append_page       (GtkNotebook *notebook,
+int gtk_notebook_append_page        (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label);
 GDK_AVAILABLE_IN_ALL
-gint gtk_notebook_append_page_menu  (GtkNotebook *notebook,
+int gtk_notebook_append_page_menu   (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     GtkWidget   *menu_label);
 GDK_AVAILABLE_IN_ALL
-gint gtk_notebook_prepend_page      (GtkNotebook *notebook,
+int gtk_notebook_prepend_page       (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label);
 GDK_AVAILABLE_IN_ALL
-gint gtk_notebook_prepend_page_menu (GtkNotebook *notebook,
+int gtk_notebook_prepend_page_menu  (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     GtkWidget   *menu_label);
 GDK_AVAILABLE_IN_ALL
-gint gtk_notebook_insert_page       (GtkNotebook *notebook,
+int gtk_notebook_insert_page        (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
-                                    gint         position);
+                                    int          position);
 GDK_AVAILABLE_IN_ALL
-gint gtk_notebook_insert_page_menu  (GtkNotebook *notebook,
+int gtk_notebook_insert_page_menu   (GtkNotebook *notebook,
                                     GtkWidget   *child,
                                     GtkWidget   *tab_label,
                                     GtkWidget   *menu_label,
-                                    gint         position);
+                                    int          position);
 GDK_AVAILABLE_IN_ALL
 void gtk_notebook_remove_page       (GtkNotebook *notebook,
-                                    gint         page_num);
+                                    int          page_num);
 
 /***********************************************************
  *           Tabs drag and drop                            *
@@ -112,18 +112,18 @@ const gchar *gtk_notebook_get_group_name (GtkNotebook *notebook);
  ***********************************************************/
 
 GDK_AVAILABLE_IN_ALL
-gint       gtk_notebook_get_current_page (GtkNotebook *notebook);
+int        gtk_notebook_get_current_page (GtkNotebook *notebook);
 GDK_AVAILABLE_IN_ALL
 GtkWidget* gtk_notebook_get_nth_page     (GtkNotebook *notebook,
-                                         gint         page_num);
+                                         int          page_num);
 GDK_AVAILABLE_IN_ALL
-gint       gtk_notebook_get_n_pages      (GtkNotebook *notebook);
+int        gtk_notebook_get_n_pages      (GtkNotebook *notebook);
 GDK_AVAILABLE_IN_ALL
-gint       gtk_notebook_page_num         (GtkNotebook *notebook,
+int        gtk_notebook_page_num         (GtkNotebook *notebook,
                                          GtkWidget   *child);
 GDK_AVAILABLE_IN_ALL
 void       gtk_notebook_set_current_page (GtkNotebook *notebook,
-                                         gint         page_num);
+                                         int          page_num);
 GDK_AVAILABLE_IN_ALL
 void       gtk_notebook_next_page        (GtkNotebook *notebook);
 GDK_AVAILABLE_IN_ALL
@@ -198,7 +198,7 @@ const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook,
 GDK_AVAILABLE_IN_ALL
 void gtk_notebook_reorder_child           (GtkNotebook *notebook,
                                           GtkWidget   *child,
-                                          gint         position);
+                                          int          position);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_notebook_get_tab_reorderable (GtkNotebook *notebook,
                                           GtkWidget   *child);
index 357670adc952cbd8dbf76b5593dbaaf548e78bd6..8fe2b39108b29a5266e37ac95d88c4c8345228b0 100644 (file)
@@ -114,8 +114,8 @@ G_DEFINE_TYPE (GtkPadController, gtk_pad_controller, GTK_TYPE_EVENT_CONTROLLER)
 static const ActionEntryData *
 gtk_pad_action_find_match (GtkPadController *controller,
                            GtkPadActionType  type,
-                           gint              index,
-                           gint              mode)
+                           int               index,
+                           int               mode)
 {
   guint i;
 
@@ -167,7 +167,7 @@ gtk_pad_controller_handle_mode_switch (GtkPadController *controller,
   if (GDK_IS_WAYLAND_DISPLAY (gdk_device_get_display (pad)))
     {
       const ActionEntryData *entry;
-      gint elem, idx, n_features;
+      int elem, idx, n_features;
 
       for (elem = GTK_PAD_ACTION_BUTTON; elem <= GTK_PAD_ACTION_STRIP; elem++)
         {
@@ -421,7 +421,7 @@ gtk_pad_controller_new (GActionGroup *group,
                        NULL);
 }
 
-static gint
+static int
 entry_compare_func (gconstpointer a,
                     gconstpointer b)
 {
@@ -474,9 +474,9 @@ gtk_pad_controller_add_entry (GtkPadController        *controller,
 void
 gtk_pad_controller_set_action_entries (GtkPadController        *controller,
                                        const GtkPadActionEntry *entries,
-                                       gint                     n_entries)
+                                       int                      n_entries)
 {
-  gint i;
+  int i;
 
   g_return_if_fail (GTK_IS_PAD_CONTROLLER (controller));
   g_return_if_fail (entries != NULL);
index b0749d626ea20833a5420c2f36e0cce01a5011d8..40a6a2fc20522d69701d2df2c68353d73e626974 100644 (file)
@@ -84,12 +84,12 @@ GtkPadController *gtk_pad_controller_new    (GActionGroup     *group,
 GDK_AVAILABLE_IN_ALL
 void  gtk_pad_controller_set_action_entries (GtkPadController        *controller,
                                              const GtkPadActionEntry *entries,
-                                             gint                     n_entries);
+                                             int                      n_entries);
 GDK_AVAILABLE_IN_ALL
 void  gtk_pad_controller_set_action         (GtkPadController *controller,
                                              GtkPadActionType  type,
-                                             gint              index,
-                                             gint              mode,
+                                             int               index,
+                                             int               mode,
                                              const gchar      *label,
                                              const gchar      *action_name);
 
index 2e353c0033b9b2b39fcd87409b8fb1439249db99..b45913dc3d08ab836cbcea9518904bf20fafa86a 100644 (file)
@@ -480,7 +480,7 @@ fill_paper_sizes_from_printer (GtkPageSetupUnixDialog *dialog,
   GList *list, *l;
   GtkPageSetup *current_page_setup, *page_setup;
   GtkPaperSize *paper_size;
-  gint i;
+  int i;
 
   g_list_store_remove_all (dialog->page_setup_list);
 
@@ -608,7 +608,7 @@ double_to_string (gdouble d,
   gchar *val, *p;
   struct lconv *locale_data;
   const gchar *decimal_point;
-  gint decimal_point_len;
+  int decimal_point_len;
 
   locale_data = localeconv ();
   decimal_point = locale_data->decimal_point;
@@ -637,7 +637,7 @@ double_to_string (gdouble d,
 
 static void
 custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
-                                 gint       response_id,
+                                 int        response_id,
                                  gpointer   user_data)
 {
   GtkPageSetupUnixDialog *dialog = GTK_PAGE_SETUP_UNIX_DIALOG (user_data);
index b76a09d564c9edc17bc1be1cc39d8ff6ebd1e156..7c6d07ab4dd73f6cf2504dff22392c5c0496a5ce 100644 (file)
@@ -142,12 +142,12 @@ struct _GtkPaned
   GtkGesture    *pan_gesture;  /* Used for touch */
   GtkGesture    *drag_gesture; /* Used for mice */
 
-  gint          start_child_size;
-  gint          drag_pos;
-  gint          last_allocation;
-  gint          max_position;
-  gint          min_position;
-  gint          original_position;
+  int           start_child_size;
+  int           drag_pos;
+  int           last_allocation;
+  int           max_position;
+  int           min_position;
+  int           original_position;
 
   guint         in_recursion  : 1;
   guint         resize_start_child : 1;
@@ -226,9 +226,9 @@ static void     gtk_paned_unrealize             (GtkWidget           *widget);
 static void     gtk_paned_css_changed           (GtkWidget           *widget,
                                                  GtkCssStyleChange   *change);
 static void     gtk_paned_calc_position         (GtkPaned         *paned,
-                                                 gint              allocation,
-                                                 gint              start_child_req,
-                                                 gint              end_child_req);
+                                                 int               allocation,
+                                                 int               start_child_req,
+                                                 int               end_child_req);
 static void     gtk_paned_set_focus_child       (GtkWidget        *widget,
                                                  GtkWidget        *child);
 static void     gtk_paned_set_saved_focus       (GtkPaned         *paned,
@@ -1057,14 +1057,14 @@ gtk_paned_dispose (GObject *object)
 
 static void
 gtk_paned_compute_position (GtkPaned *paned,
-                            gint      allocation,
-                            gint      start_child_req,
-                            gint      end_child_req,
-                            gint     *min_pos,
-                            gint     *max_pos,
-                            gint     *out_pos)
+                            int       allocation,
+                            int       start_child_req,
+                            int       end_child_req,
+                            int      *min_pos,
+                            int      *max_pos,
+                            int      *out_pos)
 {
-  gint min, max, pos;
+  int min, max, pos;
 
   min = paned->shrink_start_child ? 0 : start_child_req;
 
@@ -1114,12 +1114,12 @@ gtk_paned_compute_position (GtkPaned *paned,
 
 static void
 gtk_paned_get_preferred_size_for_orientation (GtkWidget      *widget,
-                                              gint            size,
-                                              gint           *minimum,
-                                              gint           *natural)
+                                              int             size,
+                                              int            *minimum,
+                                              int            *natural)
 {
   GtkPaned *paned = GTK_PANED (widget);
-  gint child_min, child_nat;
+  int child_min, child_nat;
 
   *minimum = *natural = 0;
 
@@ -1145,7 +1145,7 @@ gtk_paned_get_preferred_size_for_orientation (GtkWidget      *widget,
   if (paned->start_child && gtk_widget_get_visible (paned->start_child) &&
       paned->end_child && gtk_widget_get_visible (paned->end_child))
     {
-      gint handle_size;
+      int handle_size;
 
       gtk_widget_measure (paned->handle_widget,
                           paned->orientation,
@@ -1160,20 +1160,20 @@ gtk_paned_get_preferred_size_for_orientation (GtkWidget      *widget,
 
 static void
 gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget      *widget,
-                                                       gint            size,
-                                                       gint           *minimum,
-                                                       gint           *natural)
+                                                       int             size,
+                                                       int            *minimum,
+                                                       int            *natural)
 {
   GtkPaned *paned = GTK_PANED (widget);
-  gint for_start_child, for_end_child;
-  gint child_min, child_nat;
+  int for_start_child, for_end_child;
+  int child_min, child_nat;
 
   if (size > -1 &&
       paned->start_child && gtk_widget_get_visible (paned->start_child) &&
       paned->end_child && gtk_widget_get_visible (paned->end_child))
     {
-      gint start_child_req, end_child_req;
-      gint handle_size;
+      int start_child_req, end_child_req;
+      int handle_size;
 
       gtk_widget_measure (paned->handle_widget,
                           OPPOSITE_ORIENTATION (paned->orientation),
@@ -1261,7 +1261,7 @@ gtk_paned_size_allocate (GtkWidget *widget,
       GtkAllocation start_child_allocation;
       GtkAllocation end_child_allocation;
       GtkAllocation handle_allocation;
-      gint handle_size;
+      int handle_size;
 
       gtk_widget_measure (paned->handle_widget,
                           paned->orientation,
@@ -1271,7 +1271,7 @@ gtk_paned_size_allocate (GtkWidget *widget,
 
       if (paned->orientation == GTK_ORIENTATION_HORIZONTAL)
         {
-          gint start_child_width, end_child_width;
+          int start_child_width, end_child_width;
 
           gtk_widget_measure (paned->start_child, GTK_ORIENTATION_HORIZONTAL,
                               height,
@@ -1323,7 +1323,7 @@ gtk_paned_size_allocate (GtkWidget *widget,
         }
       else
         {
-          gint start_child_height, end_child_height;
+          int start_child_height, end_child_height;
 
           gtk_widget_measure (paned->start_child, GTK_ORIENTATION_VERTICAL,
                               width,
@@ -1493,9 +1493,9 @@ update_drag (GtkPaned *paned,
              int       xpos,
              int       ypos)
 {
-  gint pos;
-  gint handle_size;
-  gint size;
+  int pos;
+  int handle_size;
+  int size;
 
   if (paned->orientation == GTK_ORIENTATION_HORIZONTAL)
     pos = xpos;
@@ -1801,7 +1801,7 @@ gtk_paned_get_shrink_end_child (GtkPaned *paned)
  *
  * Returns: position of the divider
  **/
-gint
+int
 gtk_paned_get_position (GtkPaned  *paned)
 {
   g_return_val_if_fail (GTK_IS_PANED (paned), 0);
@@ -1819,7 +1819,7 @@ gtk_paned_get_position (GtkPaned  *paned)
  **/
 void
 gtk_paned_set_position (GtkPaned *paned,
-                        gint      position)
+                        int       position)
 {
   g_return_if_fail (GTK_IS_PANED (paned));
 
@@ -1867,13 +1867,13 @@ gtk_paned_set_position (GtkPaned *paned,
 
 static void
 gtk_paned_calc_position (GtkPaned *paned,
-                         gint      allocation,
-                         gint      start_child_req,
-                         gint      end_child_req)
+                         int       allocation,
+                         int       start_child_req,
+                         int       end_child_req)
 {
-  gint old_position;
-  gint old_min_position;
-  gint old_max_position;
+  int old_position;
+  int old_min_position;
+  int old_max_position;
 
   old_position = paned->start_child_size;
   old_min_position = paned->min_position;
@@ -2221,9 +2221,9 @@ gtk_paned_move_handle (GtkPaned      *paned,
 {
   if (gtk_widget_is_focus (GTK_WIDGET (paned)))
     {
-      gint old_position;
-      gint new_position;
-      gint increment;
+      int old_position;
+      int new_position;
+      int increment;
 
       enum {
         SINGLE_STEP_SIZE = 1,
index cb35932f2eda3888f5d111cfeb3d852a0f379057..af8919a2ccf15d98f70119deb899c69c9a0ac996 100644 (file)
@@ -79,10 +79,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean    gtk_paned_get_shrink_end_child (GtkPaned *paned);
 
 GDK_AVAILABLE_IN_ALL
-gint        gtk_paned_get_position (GtkPaned       *paned);
+int         gtk_paned_get_position (GtkPaned       *paned);
 GDK_AVAILABLE_IN_ALL
 void        gtk_paned_set_position (GtkPaned       *paned,
-                                    gint            position);
+                                    int             position);
 
 GDK_AVAILABLE_IN_ALL
 void        gtk_paned_set_wide_handle (GtkPaned    *paned,
index 28341813a7349758f2e6951c4a75b21f0383652e..bce931cdf066265fa8734a37d9dfcadd5d3a6d47 100644 (file)
@@ -61,7 +61,7 @@ _gtk_pango_get_default_attributes (AtkAttributeSet *attributes,
                                    PangoLayout     *layout)
 {
   PangoContext *context;
-  gint i;
+  int i;
   PangoWrapMode mode;
 
   context = pango_layout_get_context (layout);
@@ -169,9 +169,9 @@ _gtk_pango_get_default_attributes (AtkAttributeSet *attributes,
 AtkAttributeSet *
 _gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
                                PangoLayout     *layout,
-                               gint             offset,
-                               gint            *start_offset,
-                               gint            *end_offset)
+                               int              offset,
+                               int             *start_offset,
+                               int             *end_offset)
 {
   PangoAttrIterator *iter;
   PangoAttrList *attr;
@@ -180,7 +180,7 @@ _gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
   PangoAttrColor *pango_color;
   PangoAttrLanguage *pango_lang;
   PangoAttrFloat *pango_float;
-  gint index, start_index, end_index;
+  int index, start_index, end_index;
   gboolean is_next;
   glong len;
   const gchar *text;
@@ -336,13 +336,13 @@ _gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
  *
  * Returns: the new position
  */
-static gint
+static int
 _gtk_pango_move_chars (PangoLayout *layout,
-                       gint         offset,
-                       gint         count)
+                       int          offset,
+                       int          count)
 {
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   attrs = pango_layout_get_log_attrs_readonly (layout, &n_attrs);
 
@@ -382,13 +382,13 @@ _gtk_pango_move_chars (PangoLayout *layout,
  *
  * Returns: the new position
  */
-static gint
+static int
 _gtk_pango_move_words (PangoLayout  *layout,
-                       gint          offset,
-                       gint          count)
+                       int           offset,
+                       int           count)
 {
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   attrs = pango_layout_get_log_attrs_readonly (layout, &n_attrs);
 
@@ -428,13 +428,13 @@ _gtk_pango_move_words (PangoLayout  *layout,
  *
  * Returns: the new position
  */
-static gint
+static int
 _gtk_pango_move_sentences (PangoLayout  *layout,
-                           gint          offset,
-                           gint          count)
+                           int           offset,
+                           int           count)
 {
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   attrs = pango_layout_get_log_attrs_readonly (layout, &n_attrs);
 
@@ -470,10 +470,10 @@ _gtk_pango_move_sentences (PangoLayout  *layout,
  */
 static gboolean
 _gtk_pango_is_inside_word (PangoLayout  *layout,
-                           gint          offset)
+                           int           offset)
 {
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   attrs = pango_layout_get_log_attrs_readonly (layout, &n_attrs);
 
@@ -499,10 +499,10 @@ _gtk_pango_is_inside_word (PangoLayout  *layout,
  */
 static gboolean
 _gtk_pango_is_inside_sentence (PangoLayout  *layout,
-                               gint          offset)
+                               int           offset)
 {
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   attrs = pango_layout_get_log_attrs_readonly (layout, &n_attrs);
 
@@ -519,13 +519,13 @@ _gtk_pango_is_inside_sentence (PangoLayout  *layout,
 static void
 pango_layout_get_line_before (PangoLayout     *layout,
                               AtkTextBoundary  boundary_type,
-                              gint             offset,
-                              gint            *start_offset,
-                              gint            *end_offset)
+                              int              offset,
+                              int             *start_offset,
+                              int             *end_offset)
 {
   PangoLayoutIter *iter;
   PangoLayoutLine *line, *prev_line = NULL, *prev_prev_line = NULL;
-  gint index, start_index, end_index;
+  int index, start_index, end_index;
   const gchar *text;
   gboolean found = FALSE;
 
@@ -592,13 +592,13 @@ pango_layout_get_line_before (PangoLayout     *layout,
 static void
 pango_layout_get_line_at (PangoLayout     *layout,
                           AtkTextBoundary  boundary_type,
-                          gint             offset,
-                          gint            *start_offset,
-                          gint            *end_offset)
+                          int              offset,
+                          int             *start_offset,
+                          int             *end_offset)
 {
   PangoLayoutIter *iter;
   PangoLayoutLine *line, *prev_line = NULL;
-  gint index, start_index, end_index;
+  int index, start_index, end_index;
   const gchar *text;
   gboolean found = FALSE;
 
@@ -656,13 +656,13 @@ pango_layout_get_line_at (PangoLayout     *layout,
 static void
 pango_layout_get_line_after (PangoLayout     *layout,
                              AtkTextBoundary  boundary_type,
-                             gint             offset,
-                             gint            *start_offset,
-                             gint            *end_offset)
+                             int              offset,
+                             int             *start_offset,
+                             int             *end_offset)
 {
   PangoLayoutIter *iter;
   PangoLayoutLine *line, *prev_line = NULL;
-  gint index, start_index, end_index;
+  int index, start_index, end_index;
   const gchar *text;
   gboolean found = FALSE;
 
@@ -746,14 +746,14 @@ pango_layout_get_line_after (PangoLayout     *layout,
 gchar *
 _gtk_pango_get_text_before (PangoLayout     *layout,
                             AtkTextBoundary  boundary_type,
-                            gint             offset,
-                            gint            *start_offset,
-                            gint            *end_offset)
+                            int              offset,
+                            int             *start_offset,
+                            int             *end_offset)
 {
   const gchar *text;
-  gint start, end;
+  int start, end;
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   text = pango_layout_get_text (layout);
 
@@ -851,14 +851,14 @@ _gtk_pango_get_text_before (PangoLayout     *layout,
 gchar *
 _gtk_pango_get_text_after (PangoLayout     *layout,
                            AtkTextBoundary  boundary_type,
-                           gint             offset,
-                           gint            *start_offset,
-                           gint            *end_offset)
+                           int              offset,
+                           int             *start_offset,
+                           int             *end_offset)
 {
   const gchar *text;
-  gint start, end;
+  int start, end;
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   text = pango_layout_get_text (layout);
 
@@ -962,14 +962,14 @@ _gtk_pango_get_text_after (PangoLayout     *layout,
 gchar *
 _gtk_pango_get_text_at (PangoLayout     *layout,
                         AtkTextBoundary  boundary_type,
-                        gint             offset,
-                        gint            *start_offset,
-                        gint            *end_offset)
+                        int              offset,
+                        int             *start_offset,
+                        int             *end_offset)
 {
   const gchar *text;
-  gint start, end;
+  int start, end;
   const PangoLogAttr *attrs;
-  gint n_attrs;
+  int n_attrs;
 
   text = pango_layout_get_text (layout);
 
index 4c3e97cba7113ad9fda3fb32c0099984c4c71cc7..6bffb9223d572d49b87a3f19c8b0a90188ffe96d 100644 (file)
@@ -37,25 +37,25 @@ AtkAttributeSet *_gtk_pango_get_default_attributes (AtkAttributeSet *attributes,
 
 AtkAttributeSet *_gtk_pango_get_run_attributes     (AtkAttributeSet *attributes,
                                                     PangoLayout     *layout,
-                                                    gint             offset,
-                                                    gint            *start_offset,
-                                                    gint            *end_offset);
+                                                    int              offset,
+                                                    int             *start_offset,
+                                                    int             *end_offset);
 
 gchar *_gtk_pango_get_text_before (PangoLayout     *layout,
                                    AtkTextBoundary  boundary_type,
-                                   gint             offset,
-                                   gint            *start_offset,
-                                   gint            *end_offset);
+                                   int              offset,
+                                   int             *start_offset,
+                                   int             *end_offset);
 gchar *_gtk_pango_get_text_at     (PangoLayout     *layout,
                                    AtkTextBoundary  boundary_type,
-                                   gint             offset,
-                                   gint            *start_offset,
-                                   gint            *end_offset);
+                                   int              offset,
+                                   int             *start_offset,
+                                   int             *end_offset);
 gchar *_gtk_pango_get_text_after  (PangoLayout     *layout,
                                    AtkTextBoundary  boundary_type,
-                                   gint             offset,
-                                   gint            *start_offset,
-                                   gint            *end_offset);
+                                   int              offset,
+                                   int             *start_offset,
+                                   int             *end_offset);
 
 PangoAttrList *_gtk_pango_attr_list_merge (PangoAttrList *into,
                                            PangoAttrList *from);
index 119b1a9eee1f2f7ed708c93f7dd261ec4f586744..0144425fc5becc568d60646c8a5619ed93f4e31e 100644 (file)
@@ -400,7 +400,7 @@ gtk_paper_size_new_from_ipp (const gchar *ipp_name,
   float         x_dimension;
   float         y_dimension;
   gchar        *display_name = NULL;
-  gint          i;
+  int           i;
 
   /* Find paper size according to its name */
   for (i = 0; i < G_N_ELEMENTS (standard_names_offsets); i++)
index cdaf541ef520efa85e59c2b1778dbe8db813588e..d4f74d8016d5beb81aae39058190edf681340b67 100644 (file)
@@ -446,11 +446,11 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
   GtkTextDirection direction;
   GtkAllocation child_allocation;
   GList *list, *first_button;
-  gint width;
-  gint allocation_width;
+  int width;
+  int allocation_width;
   gboolean need_sliders = TRUE;
-  gint up_slider_offset = 0;
-  gint down_slider_offset = 0;
+  int up_slider_offset = 0;
+  int down_slider_offset = 0;
   GtkRequisition child_requisition;
 
   /* No path is set; we don't have to allocate anything. */
@@ -487,7 +487,7 @@ gtk_path_bar_size_allocate (GtkWidget *widget,
   else
     {
       gboolean reached_end = FALSE;
-      gint slider_space = 2 * path_bar->slider_width;
+      int slider_space = 2 * path_bar->slider_width;
 
       if (path_bar->first_scrolled_button)
        first_button = path_bar->first_scrolled_button;
@@ -689,7 +689,7 @@ gtk_path_bar_scroll_down (GtkPathBar *path_bar)
   GtkAllocation allocation, button_allocation;
   GList *list;
   GList *down_button = NULL;
-  gint space_available;
+  int space_available;
 
   if (gtk_widget_get_child_visible (BUTTON_DATA (path_bar->button_list->data)->button))
     {
index 31d814e3813505c692e8b5576eeeeca91c5a8443..a60f7c626d1481c6492311a05f69b655f062e614 100644 (file)
@@ -541,13 +541,13 @@ gtk_picture_new_for_resource (const char *resource_path)
 }
 
 typedef struct {
-  gint scale_factor;
+  int scale_factor;
 } LoaderData;
 
 static void
 on_loader_size_prepared (GdkPixbufLoader *loader,
-                        gint             width,
-                        gint             height,
+                        int              width,
+                        int              height,
                         gpointer         user_data)
 {
   LoaderData *loader_data = user_data;
@@ -568,7 +568,7 @@ on_loader_size_prepared (GdkPixbufLoader *loader,
 
 static GdkPaintable *
 load_scalable_with_loader (GFile *file,
-                           gint   scale_factor)
+                           int    scale_factor)
 {
   GdkPixbufLoader *loader;
   GBytes *bytes;
index e22d1ca1884d4e88b66e0732c4425ffb7eff16ca..03a5cf05e7a24edaf7c40fbfce6489dd962ee834 100644 (file)
@@ -150,9 +150,9 @@ struct _GtkPlacesSidebar {
   /* DND */
   gboolean   dragging_over;
   GtkWidget *drag_row;
-  gint drag_row_height;
-  gint drag_row_x;
-  gint drag_row_y;
+  int drag_row_height;
+  int drag_row_x;
+  int drag_row_y;
   GtkWidget *row_placeholder;
   DropState drop_state;
 
@@ -270,12 +270,12 @@ static void  check_unmount_and_eject       (GMount   *mount,
                                             gboolean *show_unmount,
                                             gboolean *show_eject);
 static void on_row_pressed  (GtkGestureClick *gesture,
-                             gint                  n_press,
+                             int                   n_press,
                              gdouble               x,
                              gdouble               y,
                              GtkSidebarRow        *row);
 static void on_row_released (GtkGestureClick *gesture,
-                             gint                  n_press,
+                             int                   n_press,
                              gdouble               x,
                              gdouble               y,
                              GtkSidebarRow        *row);
@@ -423,7 +423,7 @@ add_place (GtkPlacesSidebar            *sidebar,
 #else
            gpointer                    *cloud_provider_account,
 #endif
-           const gint                   index,
+           const int                    index,
            const gchar                 *tooltip)
 {
   gboolean show_eject, show_unmount;
@@ -583,7 +583,7 @@ static void
 add_special_dirs (GtkPlacesSidebar *sidebar)
 {
   GList *dirs;
-  gint index;
+  int index;
 
   dirs = NULL;
   for (index = 0; index < G_USER_N_DIRECTORIES; index++)
@@ -980,7 +980,7 @@ update_places (GtkPlacesSidebar *sidebar)
   GList *volumes;
   GVolume *volume;
   GSList *bookmarks, *sl;
-  gint index;
+  int index;
   gchar *original_uri, *name, *identifier;
   GtkListBoxRow *selected;
   gchar *home_uri;
@@ -1506,7 +1506,7 @@ check_valid_drop_target (GtkPlacesSidebar *sidebar,
   gboolean valid = FALSE;
   gchar *uri;
   GFile *dest_file;
-  gint drag_action;
+  int drag_action;
 
   g_return_val_if_fail (value != NULL, TRUE);
 
@@ -1659,8 +1659,8 @@ drag_motion_callback (GtkDropTarget    *target,
   GtkListBoxRow *row;
   GtkPlacesSidebarPlaceType place_type;
   gchar *drop_target_uri = NULL;
-  gint row_index;
-  gint row_placeholder_index;
+  int row_index;
+  int row_placeholder_index;
   const GValue *value;
 
   sidebar->dragging_over = TRUE;
@@ -1775,7 +1775,7 @@ drag_motion_callback (GtkDropTarget    *target,
 static void
 reorder_bookmarks (GtkPlacesSidebar *sidebar,
                    GtkSidebarRow    *row,
-                   gint              new_position)
+                   int               new_position)
 {
   gchar *uri;
   GFile *file;
@@ -1792,7 +1792,7 @@ reorder_bookmarks (GtkPlacesSidebar *sidebar,
 static void
 drop_files_as_bookmarks (GtkPlacesSidebar *sidebar,
                          GSList           *files,
-                         gint              position)
+                         int               position)
 {
   GSList *l;
 
@@ -1822,7 +1822,7 @@ drag_drop_callback (GtkDropTarget    *target,
                     double            y,
                     GtkPlacesSidebar *sidebar)
 {
-  gint target_order_index;
+  int target_order_index;
   GtkPlacesSidebarPlaceType target_place_type;
   GtkPlacesSidebarSectionType target_section_type;
   gchar *target_uri;
@@ -2351,7 +2351,7 @@ static void
 update_popover_shadowing (GtkWidget *row,
                           gboolean   shown)
 {
-  gint count;
+  int count;
 
   count = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "popover-count"));
   count = shown ? count + 1 : count - 1;
@@ -3382,7 +3382,7 @@ on_row_activated (GtkListBox    *list_box,
 
 static void
 on_row_pressed (GtkGestureClick *gesture,
-                gint             n_press,
+                int              n_press,
                 gdouble          x,
                 gdouble          y,
                 GtkSidebarRow   *row)
@@ -3400,8 +3400,8 @@ on_row_pressed (GtkGestureClick *gesture,
   if (section_type == SECTION_BOOKMARKS)
     {
       sidebar->drag_row = GTK_WIDGET (row);
-      sidebar->drag_row_x = (gint)x;
-      sidebar->drag_row_y = (gint)y;
+      sidebar->drag_row_x = (int)x;
+      sidebar->drag_row_y = (int)y;
     }
 
   g_object_unref (sidebar);
@@ -3409,7 +3409,7 @@ on_row_pressed (GtkGestureClick *gesture,
 
 static void
 on_row_released (GtkGestureClick *gesture,
-                 gint             n_press,
+                 int              n_press,
                  gdouble          x,
                  gdouble          y,
                  GtkSidebarRow   *row)
@@ -3543,7 +3543,7 @@ long_press_cb (GtkGesture       *gesture,
     popup_menu_cb (GTK_SIDEBAR_ROW (row));
 }
 
-static gint
+static int
 list_box_sort_func (GtkListBoxRow *row1,
                     GtkListBoxRow *row2,
                     gpointer       user_data)
@@ -3551,8 +3551,8 @@ list_box_sort_func (GtkListBoxRow *row1,
   GtkPlacesSidebarSectionType section_type_1, section_type_2;
   GtkPlacesSidebarPlaceType place_type_1, place_type_2;
   gchar *label_1, *label_2;
-  gint index_1, index_2;
-  gint retval = 0;
+  int index_1, index_2;
+  int retval = 0;
 
   g_object_get (row1,
                 "label", &label_1,
@@ -4889,7 +4889,7 @@ gtk_places_sidebar_get_shortcuts (GtkPlacesSidebar *sidebar)
  */
 GFile *
 gtk_places_sidebar_get_nth_bookmark (GtkPlacesSidebar *sidebar,
-                                     gint              n)
+                                     int               n)
 {
   GtkWidget *row;
   int k;
index a3b011b6120145be7aee082574d04f9364b9b828..8d037a0d842d834404b263d872a8eeed1b72b58a 100644 (file)
@@ -95,7 +95,7 @@ void               gtk_places_sidebar_remove_shortcut            (GtkPlacesSideb
 GListModel *       gtk_places_sidebar_get_shortcuts              (GtkPlacesSidebar   *sidebar);
 
 GFile *            gtk_places_sidebar_get_nth_bookmark           (GtkPlacesSidebar   *sidebar,
-                                                                  gint                n);
+                                                                  int                 n);
 void               gtk_places_sidebar_set_drop_targets_visible   (GtkPlacesSidebar   *sidebar,
                                                                   gboolean            visible);
 gboolean           gtk_places_sidebar_get_show_trash             (GtkPlacesSidebar   *sidebar);
index eb2b9baf7de3c8747d09b4f07227049ee3169b74..7316bd1478d2303d6ac0b031395773cbaac56f40 100644 (file)
@@ -529,7 +529,7 @@ populate_servers (GtkPlacesView *view)
   GtkWidget *child;
   gchar **uris;
   gsize num_uris;
-  gint i;
+  int i;
 
   server_list = server_list_load (view);
 
@@ -2067,7 +2067,7 @@ listbox_header_func (GtkListBoxRow *row,
     }
 }
 
-static gint
+static int
 listbox_sort_func (GtkListBoxRow *row1,
                    GtkListBoxRow *row2,
                    gpointer       user_data)
@@ -2078,7 +2078,7 @@ listbox_sort_func (GtkListBoxRow *row1,
   gchar *path2;
   gboolean *is_placeholder1;
   gboolean *is_placeholder2;
-  gint retval;
+  int retval;
 
   row1_is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row1), "is-network"));
   row2_is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row2), "is-network"));
index e3deff9a84870c0580dbd5b150eaf9e25d5f48df..cc233393113af2860a8cfba75c6d7de0ceed7f0e 100644 (file)
@@ -59,7 +59,7 @@ struct _GtkPlacesViewRow
 
   GCancellable  *cancellable;
 
-  gint           is_network : 1;
+  int            is_network : 1;
 };
 
 G_DEFINE_TYPE (GtkPlacesViewRow, gtk_places_view_row, GTK_TYPE_LIST_BOX_ROW)
index 02ab6e5c82b88eb6e0b3ff7dd1bc3d8f21216535..afbf55bedd423406562fc7b5b3855bd70a17d66b 100644 (file)
@@ -24,7 +24,7 @@ typedef struct _GtkPointerFocus GtkPointerFocus;
 
 struct _GtkPointerFocus
 {
-  gint ref_count;
+  int ref_count;
   GdkDevice *device;
   GdkEventSequence *sequence;
   GtkWindow *toplevel;
index 7b925243ec67224f547843b793576a9b8d47844e..90a19cb6e04d1cb24420793b44ce83554105ee63 100644 (file)
@@ -1050,20 +1050,20 @@ gtk_popover_finalize (GObject *object)
 
 static void
 gtk_popover_get_gap_coords (GtkPopover *popover,
-                            gint       *initial_x_out,
-                            gint       *initial_y_out,
-                            gint       *tip_x_out,
-                            gint       *tip_y_out,
-                            gint       *final_x_out,
-                            gint       *final_y_out)
+                            int        *initial_x_out,
+                            int        *initial_y_out,
+                            int        *tip_x_out,
+                            int        *tip_y_out,
+                            int        *final_x_out,
+                            int        *final_y_out)
 {
   GtkWidget *widget = GTK_WIDGET (popover);
   GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
   GdkRectangle rect = { 0 };
-  gint base, tip, tip_pos;
-  gint initial_x, initial_y;
-  gint tip_x, tip_y;
-  gint final_x, final_y;
+  int base, tip, tip_pos;
+  int initial_x, initial_y;
+  int tip_x, tip_y;
+  int final_x, final_y;
   GtkPositionType pos;
   int border_top, border_right, border_bottom;
   int border_radius;
@@ -1176,9 +1176,9 @@ gtk_popover_apply_tail_path (GtkPopover *popover,
                              cairo_t    *cr)
 {
   GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
-  gint initial_x, initial_y;
-  gint tip_x, tip_y;
-  gint final_x, final_y;
+  int initial_x, initial_y;
+  int tip_x, tip_y;
+  int final_x, final_y;
   GtkBorder border;
   GtkWidget *parent;
 
@@ -1252,7 +1252,7 @@ gtk_popover_update_shape (GtkPopover *popover)
     gdk_surface_set_input_region (priv->surface, NULL);
 }
 
-static gint
+static int
 get_border_radius (GtkWidget *widget)
 {
   GtkCssStyle *style;
@@ -1261,13 +1261,13 @@ get_border_radius (GtkWidget *widget)
   return round (_gtk_css_number_value_get (style->border->border_top_left_radius, 100));
 }
 
-static gint
+static int
 get_minimal_size (GtkPopover     *popover,
                   GtkOrientation  orientation)
 {
   GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
   GtkPositionType pos;
-  gint minimal_size;
+  int minimal_size;
   int tail_gap_width = priv->has_arrow ? TAIL_GAP_WIDTH : 0;
 
   minimal_size = 2 * get_border_radius (GTK_WIDGET (popover));
index 005fc5e50f54cf3fa19fb7514ffdfb59021ceb5e..4922faf55a85ed4ef5581cb975c0f28cad1e4b9d 100644 (file)
@@ -354,7 +354,7 @@ static GParamSpec * bar_props[LAST_PROP];
 G_DEFINE_TYPE (GtkPopoverMenuBar, gtk_popover_menu_bar, GTK_TYPE_WIDGET)
 
 static void
-tracker_remove (gint     position,
+tracker_remove (int      position,
                 gpointer user_data)
 {
   GtkWidget *bar = user_data;
@@ -383,7 +383,7 @@ popover_unmap (GtkPopover        *popover,
 
 static void
 tracker_insert (GtkMenuTrackerItem *item,
-                gint                position,
+                int                 position,
                 gpointer            user_data)
 {
   GtkPopoverMenuBar *bar = user_data;
index 2071379a1bffce1333bc07912abb4b8770862500..d89cd02182e82da58b9dbbc1dbc8d2e74732abf1 100644 (file)
@@ -134,7 +134,7 @@ gtk_print_backend_load_modules (void)
   GtkPrintBackend *backend;
   gchar *setting;
   gchar **backends;
-  gint i;
+  int i;
   GtkSettings *settings;
   GIOExtensionPoint *ep;
 
@@ -582,11 +582,11 @@ store_entry (GtkEntry  *entry,
 
 static void
 password_dialog_response (GtkWidget       *dialog,
-                          gint             response_id,
+                          int              response_id,
                           GtkPrintBackend *backend)
 {
   GtkPrintBackendPrivate *priv = backend->priv;
-  gint i, auth_info_len;
+  int i, auth_info_len;
 
   if (response_id == GTK_RESPONSE_OK)
     gtk_print_backend_set_password (backend, priv->auth_info_required, priv->auth_info, priv->store_auth_info);
@@ -627,8 +627,8 @@ request_password (GtkPrintBackend  *backend,
   GtkWidget *focus = NULL;
   GtkWidget *content_area;
   gchar     *markup;
-  gint       length;
-  gint       i;
+  int        length;
+  int        i;
   gchar    **ai_required = (gchar **) auth_info_required;
   gchar    **ai_default = (gchar **) auth_info_default;
   gchar    **ai_display = (gchar **) auth_info_display;
index c6505b7c7c557c3dbda8de568f8582919e64b088..54d8347d1c409e135052b0ea0821d3e98ef2ff2a 100644 (file)
@@ -216,7 +216,7 @@ void        gtk_printer_set_icon_name         (GtkPrinter      *printer,
                                               const gchar     *icon);
 GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_job_count         (GtkPrinter      *printer,
-                                              gint             count);
+                                              int              count);
 GDK_AVAILABLE_IN_ALL
 gboolean    gtk_printer_set_location          (GtkPrinter      *printer,
                                               const gchar     *location);
index fabbe1f4da5daa20e74e62363581c379a35e3dcd..b74a8c63c07e565b6a36558b2a2d5dcb5303e249 100644 (file)
@@ -66,7 +66,7 @@ struct _GtkPrinterPrivate
   guint accepts_ps        : 1;
 
   gchar *state_message;
-  gint job_count;
+  int job_count;
 
   GtkPrintBackend *backend;
 };
@@ -575,7 +575,7 @@ gtk_printer_set_icon_name (GtkPrinter  *printer,
  * 
  * Returns: the number of jobs on @printer
  */
-gint 
+int 
 gtk_printer_get_job_count (GtkPrinter *printer)
 {
   GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer);
@@ -587,7 +587,7 @@ gtk_printer_get_job_count (GtkPrinter *printer)
 
 gboolean
 gtk_printer_set_job_count (GtkPrinter *printer,
-                          gint        count)
+                          int         count)
 {
   GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer);
 
@@ -1079,7 +1079,7 @@ gtk_printer_get_capabilities (GtkPrinter *printer)
  * Returns: 0 if the printer match, a negative value if @a < @b, 
  *   or a positive value if @a > @b
  */
-gint
+int
 gtk_printer_compare (GtkPrinter *a, 
                      GtkPrinter *b)
 {
index fac90fa74c75afe79e29861b1817a6d49ec10250..dea92fcfd3b3be39a215fa71f99ca499634dc97b 100644 (file)
@@ -97,7 +97,7 @@ const gchar *            gtk_printer_get_location          (GtkPrinter      *pri
 GDK_AVAILABLE_IN_ALL
 const gchar *            gtk_printer_get_icon_name         (GtkPrinter      *printer);
 GDK_AVAILABLE_IN_ALL
-gint                     gtk_printer_get_job_count         (GtkPrinter      *printer);
+int                      gtk_printer_get_job_count         (GtkPrinter      *printer);
 GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_is_active             (GtkPrinter      *printer);
 GDK_AVAILABLE_IN_ALL
@@ -117,7 +117,7 @@ GList                   *gtk_printer_list_papers           (GtkPrinter      *pri
 GDK_AVAILABLE_IN_ALL
 GtkPageSetup            *gtk_printer_get_default_page_size (GtkPrinter      *printer);
 GDK_AVAILABLE_IN_ALL
-gint                     gtk_printer_compare               (GtkPrinter *a,
+int                      gtk_printer_compare               (GtkPrinter *a,
                                                            GtkPrinter *b);
 GDK_AVAILABLE_IN_ALL
 gboolean                 gtk_printer_has_details           (GtkPrinter       *printer);
index 93589648c485d608203db3b5533cc79c41461ceb..800b76ed88c1793f2cf08b65f03e57910ed2b04f 100644 (file)
@@ -644,7 +644,7 @@ check_toggled_cb (GtkToggleButton        *toggle_button,
 
 static void
 dialog_response_callback (GtkDialog              *dialog,
-                          gint                    response_id,
+                          int                     response_id,
                           GtkPrinterOptionWidget *widget)
 {
   GtkPrinterOptionWidgetPrivate *priv = widget->priv;
@@ -1075,7 +1075,7 @@ static gchar *
 trim_long_filename (const gchar *filename)
 {
   const gchar *home;
-  gint len, offset;
+  int len, offset;
   gchar *result;
 
   home = g_get_home_dir ();
index 8a98f5510d0851bc6627c3872e7e8d17724a7622..2e6dfbca9c6e2101e8ea0498a8976e70138c75b6 100644 (file)
@@ -75,9 +75,9 @@ struct _GtkPrintJob
 
   GtkPrintPages print_pages;
   GtkPageRange *page_ranges;
-  gint num_page_ranges;
+  int num_page_ranges;
   GtkPageSet page_set;
-  gint num_copies;
+  int num_copies;
   gdouble scale;
   guint number_up;
   GtkNumberUpLayout number_up_layout;
@@ -724,7 +724,7 @@ gtk_print_job_set_pages (GtkPrintJob   *job,
  */
 GtkPageRange *
 gtk_print_job_get_page_ranges (GtkPrintJob *job,
-                               gint        *n_ranges)
+                               int         *n_ranges)
 {
   *n_ranges = job->num_page_ranges;
   return job->page_ranges;
@@ -742,7 +742,7 @@ gtk_print_job_get_page_ranges (GtkPrintJob *job,
 void
 gtk_print_job_set_page_ranges (GtkPrintJob  *job,
                                GtkPageRange *ranges,
-                               gint          n_ranges)
+                               int           n_ranges)
 {
   g_free (job->page_ranges);
   job->page_ranges = ranges;
@@ -785,7 +785,7 @@ gtk_print_job_set_page_set (GtkPrintJob *job,
  *
  * Returns: the number of copies
  */
-gint
+int
 gtk_print_job_get_num_copies (GtkPrintJob *job)
 {
   return job->num_copies;
@@ -800,7 +800,7 @@ gtk_print_job_get_num_copies (GtkPrintJob *job)
  */
 void
 gtk_print_job_set_num_copies (GtkPrintJob *job,
-                              gint         num_copies)
+                              int          num_copies)
 {
   job->num_copies = num_copies;
 }
index f580dced83c6b1077438a890ec4f0ea44619e13c..25983ad60227327e83577ab48b6ac4b922e00f20 100644 (file)
@@ -94,21 +94,21 @@ void              gtk_print_job_set_pages       (GtkPrintJob       *job,
                                                  GtkPrintPages      pages);
 GDK_AVAILABLE_IN_ALL
 GtkPageRange *    gtk_print_job_get_page_ranges (GtkPrintJob       *job,
-                                                 gint              *n_ranges);
+                                                 int               *n_ranges);
 GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_page_ranges (GtkPrintJob       *job,
                                                  GtkPageRange      *ranges,
-                                                 gint               n_ranges);
+                                                 int                n_ranges);
 GDK_AVAILABLE_IN_ALL
 GtkPageSet        gtk_print_job_get_page_set    (GtkPrintJob       *job);
 GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_page_set    (GtkPrintJob       *job,
                                                  GtkPageSet         page_set);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_print_job_get_num_copies  (GtkPrintJob       *job);
+int               gtk_print_job_get_num_copies  (GtkPrintJob       *job);
 GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_num_copies  (GtkPrintJob       *job,
-                                                 gint               num_copies);
+                                                 int                num_copies);
 GDK_AVAILABLE_IN_ALL
 gdouble           gtk_print_job_get_scale       (GtkPrintJob       *job);
 GDK_AVAILABLE_IN_ALL
index 6a7b509978e6e0b55ad8cfa453c33de27a15ef44..15708a03d2f7f8a0bef3e7757db645c079a74338 100644 (file)
@@ -40,10 +40,10 @@ struct _GtkPrintOperationPrivate
   GtkPageSetup *default_page_setup;
   GtkPrintSettings *print_settings;
   gchar *job_name;
-  gint nr_of_pages;
-  gint nr_of_pages_to_print;
-  gint page_position;
-  gint current_page;
+  int nr_of_pages;
+  int nr_of_pages_to_print;
+  int page_position;
+  int current_page;
   GtkUnit unit;
   gchar *export_filename;
   guint use_full_page      : 1;
@@ -65,9 +65,9 @@ struct _GtkPrintOperationPrivate
   
   GtkPrintPages print_pages;
   GtkPageRange *page_ranges;
-  gint num_page_ranges;
+  int num_page_ranges;
   
-  gint manual_num_copies;
+  int manual_num_copies;
   guint manual_collation   : 1;
   guint manual_reverse     : 1;
   guint manual_orientation : 1;
index 87d97e240ec14a18de79c9a7962695143373c111..1095d7440cfa8c385dd65d4fcc369f0e9043d8a1 100644 (file)
@@ -225,7 +225,7 @@ gtk_print_operation_unix_launch_preview (GtkPrintOperation *op,
   gboolean settings_used = FALSE;
   GdkDisplay *display;
   GError *error = NULL;
-  gint fd;
+  int fd;
   gboolean retval;
 
   cairo_surface_destroy (surface);
@@ -609,7 +609,7 @@ finish_print (PrintResponseData *rdata,
 
 static void 
 handle_print_response (GtkWidget *dialog,
-                      gint       response,
+                      int        response,
                       gpointer   data)
 {
   GtkPrintUnixDialog *pd = GTK_PRINT_UNIX_DIALOG (dialog);
@@ -749,7 +749,7 @@ write_preview (void                *closure,
                const unsigned char *data,
                unsigned int         length)
 {
-  gint fd = GPOINTER_TO_INT (closure);
+  int fd = GPOINTER_TO_INT (closure);
   gssize written;
   
   while (length > 0) 
@@ -774,7 +774,7 @@ write_preview (void                *closure,
 static void
 close_preview (void *data)
 {
-  gint fd = GPOINTER_TO_INT (data);
+  int fd = GPOINTER_TO_INT (data);
 
   close (fd);
 }
@@ -787,7 +787,7 @@ gtk_print_operation_unix_create_preview_surface (GtkPrintOperation *op,
                                                  gchar            **target)
 {
   gchar *filename;
-  gint fd;
+  int fd;
   GtkPaperSize *paper_size;
   gdouble w, h;
   cairo_surface_t *surface;
@@ -920,7 +920,7 @@ page_setup_data_free (gpointer data)
 
 static void
 handle_page_setup_response (GtkWidget *dialog,
-                           gint       response,
+                           int        response,
                            gpointer   data)
 {
   GtkPageSetupUnixDialog *psd;
index 9f21634fc4a900b1d2b50eeacf8f37259e286916..1410eea5a01f7c0fca65a5a62ab12c9782ee794c 100644 (file)
@@ -151,7 +151,7 @@ typedef struct _PrintPagesData PrintPagesData;
 static void          preview_iface_init      (GtkPrintOperationPreviewIface *iface);
 static GtkPageSetup *create_page_setup       (GtkPrintOperation             *op);
 static void          common_render_page      (GtkPrintOperation             *op,
-                                             gint                           page_nr);
+                                             int                            page_nr);
 static void          increment_page_sequence (PrintPagesData *data);
 static void          prepare_data            (PrintPagesData *data);
 static void          clamp_page_ranges       (PrintPagesData *data);
@@ -258,7 +258,7 @@ gtk_print_operation_init (GtkPrintOperation *operation)
 
 static void
 preview_iface_render_page (GtkPrintOperationPreview *preview,
-                          gint                      page_nr)
+                          int                       page_nr)
 {
 
   GtkPrintOperation *op;
@@ -297,7 +297,7 @@ preview_iface_end_preview (GtkPrintOperationPreview *preview)
 
 static gboolean
 preview_iface_is_selected (GtkPrintOperationPreview *preview,
-                          gint                      page_nr)
+                          int                       page_nr)
 {
   GtkPrintOperation *op = GTK_PRINT_OPERATION (preview);
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
@@ -500,20 +500,20 @@ gtk_print_operation_get_property (GObject    *object,
 struct _PrintPagesData
 {
   GtkPrintOperation *op;
-  gint uncollated_copies;
-  gint collated_copies;
-  gint uncollated, collated, total;
+  int uncollated_copies;
+  int collated_copies;
+  int uncollated, collated, total;
 
-  gint range, num_ranges;
+  int range, num_ranges;
   GtkPageRange *ranges;
   GtkPageRange one_range;
 
-  gint page;
-  gint sheet;
-  gint first_position, last_position;
-  gint first_sheet;
-  gint num_of_sheets;
-  gint *pages;
+  int page;
+  int sheet;
+  int first_position, last_position;
+  int first_sheet;
+  int num_of_sheets;
+  int *pages;
 
   GtkWidget *progress;
  
@@ -865,13 +865,13 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
    * static void
    * draw_page (GtkPrintOperation *operation,
    *            GtkPrintContext   *context,
-   *            gint               page_nr,
+   *            int                page_nr,
    *            gpointer           user_data)
    * {
    *   cairo_t *cr;
    *   PangoLayout *layout;
    *   gdouble width, text_height;
-   *   gint layout_height;
+   *   int layout_height;
    *   PangoFontDescription *desc;
    *   
    *   cr = gtk_print_context_get_cairo_context (context);
@@ -1555,7 +1555,7 @@ gtk_print_operation_set_job_name (GtkPrintOperation *op,
  **/
 void
 gtk_print_operation_set_n_pages (GtkPrintOperation *op,
-                                gint               n_pages)
+                                int                n_pages)
 {
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
 
@@ -1586,7 +1586,7 @@ gtk_print_operation_set_n_pages (GtkPrintOperation *op,
  **/
 void
 gtk_print_operation_set_current_page (GtkPrintOperation *op,
-                                     gint               current_page)
+                                     int                current_page)
 {
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
 
@@ -2058,8 +2058,8 @@ static void
 clamp_page_ranges (PrintPagesData *data)
 {
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
-  gint                      num_of_correct_ranges;
-  gint                      i;
+  int                       num_of_correct_ranges;
+  int                       i;
 
   num_of_correct_ranges = 0;
 
@@ -2096,7 +2096,7 @@ static void
 increment_page_sequence (PrintPagesData *data)
 {
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
-  gint inc;
+  int inc;
 
   if (data->total == -1)
     {
@@ -2351,7 +2351,7 @@ gtk_print_operation_draw_page_finish (GtkPrintOperation *op)
 
 static void
 common_render_page (GtkPrintOperation *op,
-                   gint               page_nr)
+                   int                page_nr)
 {
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
   GtkPageSetup *page_setup;
@@ -2397,7 +2397,7 @@ common_render_page (GtkPrintOperation *op,
       gdouble             x_step, y_step;
       gdouble             x_scale, y_scale, scale;
       gdouble             horizontal_offset = 0.0, vertical_offset = 0.0;
-      gint                columns, rows, x, y, tmp_length;
+      int                 columns, rows, x, y, tmp_length;
 
       page_setup = gtk_print_context_get_page_setup (print_context);
       orientation = gtk_page_setup_get_orientation (page_setup);
@@ -2582,7 +2582,7 @@ prepare_data (PrintPagesData *data)
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
   GtkPageSetup             *page_setup;
   gboolean                  paginated = FALSE;
-  gint                      i, j, counter;
+  int                       i, j, counter;
 
   if (priv->manual_collation)
     {
@@ -2657,7 +2657,7 @@ prepare_data (PrintPagesData *data)
   for (i = 0; i < data->num_ranges; i++)
     priv->nr_of_pages_to_print += data->ranges[i].end - data->ranges[i].start + 1;
 
-  data->pages = g_new (gint, priv->nr_of_pages_to_print);
+  data->pages = g_new (int, priv->nr_of_pages_to_print);
   counter = 0;
   for (i = 0; i < data->num_ranges; i++)
     for (j = data->ranges[i].start; j <= data->ranges[i].end; j++)
@@ -2797,7 +2797,7 @@ print_pages_idle (gpointer user_data)
   
 static void
 handle_progress_response (GtkWidget *dialog, 
-                         gint       response,
+                         int        response,
                          gpointer   data)
 {
   GtkPrintOperation *op = (GtkPrintOperation *)data;
@@ -3250,7 +3250,7 @@ gtk_print_operation_get_has_selection (GtkPrintOperation *op)
  *
  * Returns: the number of pages that will be printed
  **/
-gint
+int
 gtk_print_operation_get_n_pages_to_print (GtkPrintOperation *op)
 {
   GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
index c10ba4b7b9db971887e576dbc3377a5dd3f36c48..4751290210969b1c29a8d9c118a246d2037981f0 100644 (file)
@@ -161,11 +161,11 @@ struct _GtkPrintOperationClass
                                   GtkPrintContext   *context);
   void     (*request_page_setup) (GtkPrintOperation *operation,
                                   GtkPrintContext   *context,
-                                  gint               page_nr,
+                                  int                page_nr,
                                   GtkPageSetup      *setup);
   void     (*draw_page)          (GtkPrintOperation *operation,
                                   GtkPrintContext   *context,
-                                  gint               page_nr);
+                                  int                page_nr);
   void     (*end_print)          (GtkPrintOperation *operation,
                                   GtkPrintContext   *context);
   void     (*status_changed)     (GtkPrintOperation *operation);
@@ -237,10 +237,10 @@ void                    gtk_print_operation_set_job_name           (GtkPrintOper
                                                                     const gchar        *job_name);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_n_pages            (GtkPrintOperation  *op,
-                                                                    gint                n_pages);
+                                                                    int                 n_pages);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_current_page       (GtkPrintOperation  *op,
-                                                                    gint                current_page);
+                                                                    int                 current_page);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_print_operation_set_use_full_page      (GtkPrintOperation  *op,
                                                                     gboolean            full_page);
@@ -298,7 +298,7 @@ void                    gtk_print_operation_set_embed_page_setup   (GtkPrintOper
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_print_operation_get_embed_page_setup   (GtkPrintOperation  *op);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_print_operation_get_n_pages_to_print   (GtkPrintOperation  *op);
+int                     gtk_print_operation_get_n_pages_to_print   (GtkPrintOperation  *op);
 
 GDK_AVAILABLE_IN_ALL
 GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow          *parent,
index 98cca3ffdb4c57024f01bcbc1a70ce5ffb9481ac..f81d49b832bfbbb13d0084fcab25477d6e11bc35 100644 (file)
@@ -125,7 +125,7 @@ gtk_print_operation_preview_base_init (gpointer g_iface)
  */
 void    
 gtk_print_operation_preview_render_page (GtkPrintOperationPreview *preview,
-                                        gint                      page_nr)
+                                        int                       page_nr)
 {
   g_return_if_fail (GTK_IS_PRINT_OPERATION_PREVIEW (preview));
 
@@ -161,7 +161,7 @@ gtk_print_operation_preview_end_preview (GtkPrintOperationPreview *preview)
  */
 gboolean
 gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
-                                        gint                      page_nr)
+                                        int                       page_nr)
 {
   g_return_val_if_fail (GTK_IS_PRINT_OPERATION_PREVIEW (preview), FALSE);
 
index 29345c7f2727a8d1cf966ea237af792e85e3215d..387b629a171cd6da5794b9151a1096cdb48222f2 100644 (file)
@@ -50,9 +50,9 @@ struct _GtkPrintOperationPreviewIface
 
   /* methods */
   void              (*render_page)    (GtkPrintOperationPreview *preview,
-                                      gint                      page_nr);
+                                      int                       page_nr);
   gboolean          (*is_selected)    (GtkPrintOperationPreview *preview,
-                                      gint                      page_nr);
+                                      int                       page_nr);
   void              (*end_preview)    (GtkPrintOperationPreview *preview);
 
   /* Padding for future expansion */
@@ -71,12 +71,12 @@ GType   gtk_print_operation_preview_get_type       (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 void     gtk_print_operation_preview_render_page (GtkPrintOperationPreview *preview,
-                                                 gint                      page_nr);
+                                                 int                       page_nr);
 GDK_AVAILABLE_IN_ALL
 void     gtk_print_operation_preview_end_preview (GtkPrintOperationPreview *preview);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_print_operation_preview_is_selected (GtkPrintOperationPreview *preview,
-                                                 gint                      page_nr);
+                                                 int                       page_nr);
 
 G_END_DECLS
 
index 5195f525367c2bb72681fe12d7546fd7444d2f86..e0a1e9582fd0ab788cb8a8b69c1aacc9b8addecc 100644 (file)
@@ -408,10 +408,10 @@ gtk_print_settings_set_length (GtkPrintSettings *settings,
  * 
  * Returns: the integer value of @key
  */
-gint
+int
 gtk_print_settings_get_int_with_default (GtkPrintSettings *settings,
                                         const gchar      *key,
-                                        gint              def)
+                                        int               def)
 {
   const gchar *val;
 
@@ -431,7 +431,7 @@ gtk_print_settings_get_int_with_default (GtkPrintSettings *settings,
  * 
  * Returns: the integer value of @key 
  */
-gint
+int
 gtk_print_settings_get_int (GtkPrintSettings *settings,
                            const gchar      *key)
 {
@@ -449,7 +449,7 @@ gtk_print_settings_get_int (GtkPrintSettings *settings,
 void
 gtk_print_settings_set_int (GtkPrintSettings *settings,
                            const gchar      *key,
-                           gint              value)
+                           int               value)
 {
   gchar buf[128];
   g_sprintf (buf, "%d", value);
@@ -1051,7 +1051,7 @@ gtk_print_settings_set_number_up_layout (GtkPrintSettings  *settings,
  * 
  * Returns: the number of copies to print
  */
-gint
+int
 gtk_print_settings_get_n_copies (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_N_COPIES, 1);
@@ -1066,7 +1066,7 @@ gtk_print_settings_get_n_copies (GtkPrintSettings *settings)
  */
 void
 gtk_print_settings_set_n_copies (GtkPrintSettings *settings,
-                                gint              num_copies)
+                                int               num_copies)
 {
   gtk_print_settings_set_int (settings, GTK_PRINT_SETTINGS_N_COPIES,
                              num_copies);
@@ -1080,7 +1080,7 @@ gtk_print_settings_set_n_copies (GtkPrintSettings *settings,
  * 
  * Returns: the number of pages per sheet
  */
-gint
+int
 gtk_print_settings_get_number_up (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_NUMBER_UP, 1);
@@ -1095,7 +1095,7 @@ gtk_print_settings_get_number_up (GtkPrintSettings *settings)
  */
 void
 gtk_print_settings_set_number_up (GtkPrintSettings *settings,
-                                 gint              number_up)
+                                 int               number_up)
 {
   gtk_print_settings_set_int (settings, GTK_PRINT_SETTINGS_NUMBER_UP,
                                number_up);
@@ -1109,7 +1109,7 @@ gtk_print_settings_set_number_up (GtkPrintSettings *settings,
  * 
  * Returns: the resolution in dpi
  */
-gint
+int
 gtk_print_settings_get_resolution (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION, 300);
@@ -1126,7 +1126,7 @@ gtk_print_settings_get_resolution (GtkPrintSettings *settings)
  */
 void
 gtk_print_settings_set_resolution (GtkPrintSettings *settings,
-                                  gint              resolution)
+                                  int               resolution)
 {
   gtk_print_settings_set_int (settings, GTK_PRINT_SETTINGS_RESOLUTION,
                              resolution);
@@ -1144,7 +1144,7 @@ gtk_print_settings_set_resolution (GtkPrintSettings *settings,
  * 
  * Returns: the horizontal resolution in dpi
  */
-gint
+int
 gtk_print_settings_get_resolution_x (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION_X, 300);
@@ -1158,7 +1158,7 @@ gtk_print_settings_get_resolution_x (GtkPrintSettings *settings)
  * 
  * Returns: the vertical resolution in dpi
  */
-gint
+int
 gtk_print_settings_get_resolution_y (GtkPrintSettings *settings)
 {
   return gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION_Y, 300);
@@ -1176,8 +1176,8 @@ gtk_print_settings_get_resolution_y (GtkPrintSettings *settings)
  */
 void
 gtk_print_settings_set_resolution_xy (GtkPrintSettings *settings,
-                                     gint              resolution_x,
-                                     gint              resolution_y)
+                                     int               resolution_x,
+                                     int               resolution_y)
 {
   gtk_print_settings_set_int (settings, GTK_PRINT_SETTINGS_RESOLUTION_X,
                              resolution_x);
@@ -1323,12 +1323,12 @@ gtk_print_settings_set_print_pages (GtkPrintSettings *settings,
  */
 GtkPageRange *
 gtk_print_settings_get_page_ranges (GtkPrintSettings *settings,
-                                   gint             *num_ranges)
+                                   int              *num_ranges)
 {
   const gchar *val;
   gchar **range_strs;
   GtkPageRange *ranges;
-  gint i, n;
+  int i, n;
   
   val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PAGE_RANGES);
 
@@ -1349,16 +1349,16 @@ gtk_print_settings_get_page_ranges (GtkPrintSettings *settings,
 
   for (i = 0; i < n; i++)
     {
-      gint start, end;
+      int start, end;
       gchar *str;
 
-      start = (gint)strtol (range_strs[i], &str, 10);
+      start = (int)strtol (range_strs[i], &str, 10);
       end = start;
 
       if (*str == '-')
        {
          str++;
-         end = (gint)strtol (str, NULL, 10);
+         end = (int)strtol (str, NULL, 10);
        }
 
       ranges[i].start = start;
@@ -1382,10 +1382,10 @@ gtk_print_settings_get_page_ranges (GtkPrintSettings *settings,
 void
 gtk_print_settings_set_page_ranges  (GtkPrintSettings *settings,
                                     GtkPageRange     *page_ranges,
-                                    gint              num_ranges)
+                                    int               num_ranges)
 {
   GString *s;
-  gint i;
+  int i;
   
   s = g_string_new ("");
 
index 6587400674509f2d776e39e55ba957f50748eed4..e019a543232c1b46bdfcfa4d8a2d5e9410bda93c 100644 (file)
@@ -47,8 +47,8 @@ typedef struct _GtkPageRange GtkPageRange;
  */
 struct _GtkPageRange
 {
-  gint start;
-  gint end;
+  int start;
+  int end;
 };
 
 GDK_AVAILABLE_IN_ALL
@@ -128,16 +128,16 @@ void              gtk_print_settings_set_length              (GtkPrintSettings
                                                              gdouble               value,
                                                              GtkUnit               unit);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_print_settings_get_int                 (GtkPrintSettings     *settings,
+int               gtk_print_settings_get_int                 (GtkPrintSettings     *settings,
                                                              const gchar          *key);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_print_settings_get_int_with_default    (GtkPrintSettings     *settings,
+int               gtk_print_settings_get_int_with_default    (GtkPrintSettings     *settings,
                                                              const gchar          *key,
-                                                             gint                  def);
+                                                             int                   def);
 GDK_AVAILABLE_IN_ALL
 void              gtk_print_settings_set_int                 (GtkPrintSettings     *settings,
                                                              const gchar          *key,
-                                                             gint                  value);
+                                                             int                   value);
 
 #define GTK_PRINT_SETTINGS_PRINTER          "printer"
 #define GTK_PRINT_SETTINGS_ORIENTATION      "orientation"
@@ -260,33 +260,33 @@ GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_quality           (GtkPrintSettings   *settings,
                                                                GtkPrintQuality     quality);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_print_settings_get_n_copies          (GtkPrintSettings   *settings);
+int                   gtk_print_settings_get_n_copies          (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_n_copies          (GtkPrintSettings   *settings,
-                                                               gint                num_copies);
+                                                               int                 num_copies);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_print_settings_get_number_up         (GtkPrintSettings   *settings);
+int                   gtk_print_settings_get_number_up         (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_number_up         (GtkPrintSettings   *settings,
-                                                               gint                number_up);
+                                                               int                 number_up);
 GDK_AVAILABLE_IN_ALL
 GtkNumberUpLayout     gtk_print_settings_get_number_up_layout  (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_number_up_layout  (GtkPrintSettings   *settings,
                                                                GtkNumberUpLayout   number_up_layout);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_print_settings_get_resolution        (GtkPrintSettings   *settings);
+int                   gtk_print_settings_get_resolution        (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_resolution        (GtkPrintSettings   *settings,
-                                                               gint                resolution);
+                                                               int                 resolution);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_print_settings_get_resolution_x      (GtkPrintSettings   *settings);
+int                   gtk_print_settings_get_resolution_x      (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_print_settings_get_resolution_y      (GtkPrintSettings   *settings);
+int                   gtk_print_settings_get_resolution_y      (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_resolution_xy     (GtkPrintSettings   *settings,
-                                                               gint                resolution_x,
-                                                               gint                resolution_y);
+                                                               int                 resolution_x,
+                                                               int                 resolution_y);
 GDK_AVAILABLE_IN_ALL
 gdouble               gtk_print_settings_get_printer_lpi       (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
@@ -304,11 +304,11 @@ void                  gtk_print_settings_set_print_pages       (GtkPrintSettings
                                                                GtkPrintPages       pages);
 GDK_AVAILABLE_IN_ALL
 GtkPageRange *        gtk_print_settings_get_page_ranges       (GtkPrintSettings   *settings,
-                                                               gint               *num_ranges);
+                                                               int                *num_ranges);
 GDK_AVAILABLE_IN_ALL
 void                  gtk_print_settings_set_page_ranges       (GtkPrintSettings   *settings,
                                                                GtkPageRange       *page_ranges,
-                                                               gint                num_ranges);
+                                                               int                 num_ranges);
 GDK_AVAILABLE_IN_ALL
 GtkPageSet            gtk_print_settings_get_page_set          (GtkPrintSettings   *settings);
 GDK_AVAILABLE_IN_ALL
index eac69cecafd547daf424b5221377051a3c3bc5f1..75645e0b7c5cefda85b242a0705733b1a7069ec8 100644 (file)
@@ -146,7 +146,7 @@ static void     printer_status_cb                  (GtkPrintBackend    *backend,
 static void     update_collate_icon                (GtkToggleButton    *toggle_button,
                                                     GtkPrintUnixDialog *dialog);
 static void     error_dialogs                      (GtkPrintUnixDialog *print_dialog,
-                                                   gint                print_dialog_response_id,
+                                                   int                 print_dialog_response_id,
                                                    gpointer            data);
 static gboolean page_range_entry_focus_changed     (GtkWidget          *entry,
                                                     GParamSpec         *pspec,
@@ -177,7 +177,7 @@ static void     draw_page                          (GtkDrawingArea      *da,
 
 static gboolean dialog_get_collate                 (GtkPrintUnixDialog *dialog);
 static gboolean dialog_get_reverse                 (GtkPrintUnixDialog *dialog);
-static gint     dialog_get_n_copies                (GtkPrintUnixDialog *dialog);
+static int      dialog_get_n_copies                (GtkPrintUnixDialog *dialog);
 
 static gboolean set_active_printer                 (GtkPrintUnixDialog *dialog,
                                                     const gchar        *printer_name);
@@ -334,7 +334,7 @@ struct _GtkPrintUnixDialog
 
   gchar *format_for_printer;
 
-  gint current_page;
+  int current_page;
   GtkCssNode *collate_paper_node;
   GtkCssNode *page_layout_paper_node;
 };
@@ -566,7 +566,7 @@ on_confirmation_dialog_response (GtkWidget *dialog,
  */
 static void
 error_dialogs (GtkPrintUnixDialog *dialog,
-               gint                dialog_response_id,
+               int                 dialog_response_id,
                gpointer            data)
 {
   if (dialog != NULL && dialog_response_id == GTK_RESPONSE_OK)
@@ -1275,10 +1275,10 @@ add_option_to_extension_point (GtkPrinterOption *option,
     gtk_box_append (GTK_BOX (extension_point), widget);
 }
 
-static gint
+static int
 grid_rows (GtkGrid *table)
 {
-  gint t0, t1, l, t, w, h;
+  int t0, t1, l, t, w, h;
   GtkWidget *c;
   gboolean first;
 
@@ -1345,7 +1345,7 @@ setup_page_table (GtkPrinterOptionSet *options,
                   GtkWidget           *table,
                   GtkWidget           *page)
 {
-  gint nrows;
+  int nrows;
 
   gtk_printer_option_set_foreach_in_group (options, group,
                                            add_option_to_table,
@@ -1671,7 +1671,7 @@ fill_paper_sizes (GtkPrintUnixDialog *dialog,
   GList *list, *l;
   GtkPageSetup *page_setup;
   GtkPaperSize *paper_size;
-  gint i;
+  int i;
 
   g_list_store_remove_all (dialog->page_setup_list);
 
@@ -1930,14 +1930,14 @@ static void
 paint_page (GtkPrintUnixDialog *dialog,
             GtkWidget  *widget,
             cairo_t    *cr,
-            gint        x,
-            gint        y,
+            int         x,
+            int         y,
             const char *text,
-            gint        text_x)
+            int         text_x)
 {
   GtkStyleContext *context;
-  gint width, height;
-  gint text_y;
+  int width, height;
+  int text_y;
   GdkRGBA color;
 
   width = 20;
@@ -1973,9 +1973,9 @@ draw_collate (GtkDrawingArea *da,
   GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (data);
   GtkWidget *widget = GTK_WIDGET (da);
   gboolean collate, reverse, rtl;
-  gint copies;
-  gint text_x;
-  gint x, y, x1, x2, p1, p2;
+  int copies;
+  int text_x;
+  int x, y, x1, x2, p1, p2;
 
   collate = dialog_get_collate (dialog);
   reverse = dialog_get_reverse (dialog);
@@ -2062,13 +2062,13 @@ is_range_separator (gchar c)
 
 static GtkPageRange *
 dialog_get_page_ranges (GtkPrintUnixDialog *dialog,
-                        gint               *n_ranges_out)
+                        int                *n_ranges_out)
 {
-  gint i, n_ranges;
+  int i, n_ranges;
   const gchar *text, *p;
   gchar *next;
   GtkPageRange *ranges;
-  gint start, end;
+  int start, end;
 
   text = gtk_editable_get_text (GTK_EDITABLE (dialog->page_range_entry));
 
@@ -2143,9 +2143,9 @@ dialog_get_page_ranges (GtkPrintUnixDialog *dialog,
 static void
 dialog_set_page_ranges (GtkPrintUnixDialog *dialog,
                         GtkPageRange       *ranges,
-                        gint                n_ranges)
+                        int                 n_ranges)
 {
-  gint i;
+  int i;
   GString *s = g_string_new (NULL);
 
   for (i = 0; i < n_ranges; i++)
@@ -2224,13 +2224,13 @@ dialog_set_page_set (GtkPrintUnixDialog *dialog,
   gtk_drop_down_set_selected (GTK_DROP_DOWN (dialog->page_set_combo), (guint)val);
 }
 
-static gint
+static int
 dialog_get_n_copies (GtkPrintUnixDialog *dialog)
 {
   GtkAdjustment *adjustment;
   const gchar *text;
   gchar *endptr = NULL;
-  gint n_copies;
+  int n_copies;
 
   adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dialog->copies_spin));
 
@@ -2254,7 +2254,7 @@ dialog_get_n_copies (GtkPrintUnixDialog *dialog)
 
 static void
 dialog_set_n_copies (GtkPrintUnixDialog *dialog,
-                     gint                n_copies)
+                     int                 n_copies)
 {
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (dialog->copies_spin), n_copies);
 }
@@ -2289,11 +2289,11 @@ dialog_set_reverse (GtkPrintUnixDialog *dialog,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->reverse_check), reverse);
 }
 
-static gint
+static int
 dialog_get_pages_per_sheet (GtkPrintUnixDialog *dialog)
 {
   const gchar *val;
-  gint num;
+  int num;
 
   val = gtk_printer_option_widget_get_value (dialog->pages_per_sheet);
 
@@ -2360,8 +2360,8 @@ draw_page (GtkDrawingArea *da,
   GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (data);
   GtkStyleContext *context;
   gdouble ratio;
-  gint w, h, tmp;
-  gint pages_x, pages_y, i, x, y, layout_w, layout_h;
+  int w, h, tmp;
+  int pages_x, pages_y, i, x, y, layout_w, layout_h;
   gdouble page_width, page_height;
   GtkPageOrientation orientation;
   gboolean landscape;
@@ -2370,13 +2370,13 @@ draw_page (GtkDrawingArea *da,
   gchar *text;
   GdkRGBA color;
   GtkNumberUpLayout number_up_layout;
-  gint start_x, end_x, start_y, end_y;
-  gint dx, dy;
+  int start_x, end_x, start_y, end_y;
+  int dx, dy;
   gboolean horizontal;
   GtkPageSetup *page_setup;
   gdouble paper_width, paper_height;
   gdouble pos_x, pos_y;
-  gint pages_per_sheet;
+  int pages_per_sheet;
   gboolean ltr = TRUE;
 
   orientation = gtk_page_setup_get_orientation (dialog->page_setup);
@@ -2623,7 +2623,7 @@ draw_page (GtkDrawingArea *da,
     {
       PangoContext *pango_c = NULL;
       PangoFontDescription *pango_f = NULL;
-      gint font_size = 12 * PANGO_SCALE;
+      int font_size = 12 * PANGO_SCALE;
 
       pos_x += 1;
       pos_y += 1;
@@ -2906,7 +2906,7 @@ update_number_up_layout (GtkPrintUnixDialog *dialog)
 
 static void
 custom_paper_dialog_response_cb (GtkDialog *custom_paper_dialog,
-                                 gint       response_id,
+                                 int        response_id,
                                  gpointer   user_data)
 {
   GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (user_data);
@@ -3131,7 +3131,7 @@ gtk_print_unix_dialog_get_page_setup_set (GtkPrintUnixDialog *dialog)
  */
 void
 gtk_print_unix_dialog_set_current_page (GtkPrintUnixDialog *dialog,
-                                        gint                current_page)
+                                        int                 current_page)
 {
   g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog));
 
@@ -3154,7 +3154,7 @@ gtk_print_unix_dialog_set_current_page (GtkPrintUnixDialog *dialog,
  *
  * Returns: the current page of @dialog
  */
-gint
+int
 gtk_print_unix_dialog_get_current_page (GtkPrintUnixDialog *dialog)
 {
   g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), -1);
@@ -3208,7 +3208,7 @@ gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog,
 {
   const gchar *printer;
   GtkPageRange *ranges;
-  gint num_ranges;
+  int num_ranges;
 
   g_return_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog));
   g_return_if_fail (settings == NULL || GTK_IS_PRINT_SETTINGS (settings));
@@ -3270,7 +3270,7 @@ gtk_print_unix_dialog_get_settings (GtkPrintUnixDialog *dialog)
   GtkPrintSettings *settings;
   GtkPrintPages print_pages;
   GtkPageRange *ranges;
-  gint n_ranges;
+  int n_ranges;
 
   g_return_val_if_fail (GTK_IS_PRINT_UNIX_DIALOG (dialog), NULL);
 
index 5addb0dc9befe2af88f769606bd392ef5ead1ddc..1555668358d368269ecf631d1446c35465884c90 100644 (file)
@@ -49,9 +49,9 @@ GDK_AVAILABLE_IN_ALL
 GtkPageSetup *       gtk_print_unix_dialog_get_page_setup          (GtkPrintUnixDialog *dialog);
 GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_current_page        (GtkPrintUnixDialog *dialog,
-                                                                   gint                current_page);
+                                                                   int                 current_page);
 GDK_AVAILABLE_IN_ALL
-gint                 gtk_print_unix_dialog_get_current_page        (GtkPrintUnixDialog *dialog);
+int                  gtk_print_unix_dialog_get_current_page        (GtkPrintUnixDialog *dialog);
 GDK_AVAILABLE_IN_ALL
 void                 gtk_print_unix_dialog_set_settings            (GtkPrintUnixDialog *dialog,
                                                                    GtkPrintSettings   *settings);
index fe1197cdb8deb584d6d09f97d19fd8e4d5f855b8..cb375a2f14dcf1db906d80a493f9b20a5d754994 100644 (file)
@@ -278,7 +278,7 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard     *pasteboard,
 {
   NSString *type;
   GdkDisplay *display;
-  gint format;
+  int format;
   const guchar *data;
   NSUInteger length;
 
index 774820b8eb4eae02a712944030fa6cbdc6d41412..0078baae370fe79177d8f147898dfd45142be2f1 100644 (file)
@@ -125,7 +125,7 @@ gtk_query_matches_string (GtkQuery    *query,
   GtkQueryPrivate *priv = gtk_query_get_instance_private (query);
   gchar *prepared;
   gboolean found;
-  gint i;
+  int i;
 
   if (!priv->text)
     return FALSE;
index e76ca4e68895c6568b58d73c2db518e016a7b95d..e8b87a1e8869c4c2a363507c29eca0cad724ec9e 100644 (file)
@@ -92,11 +92,11 @@ struct _GtkRangePrivate
   gdouble  fill_level;
   gdouble *marks;
 
-  gint *mark_pos;
-  gint  n_marks;
-  gint  round_digits;                /* Round off value to this many digits, -1 for no rounding */
-  gint  slide_initial_slider_position;
-  gint  slide_initial_coordinate_delta;
+  int *mark_pos;
+  int   n_marks;
+  int   round_digits;                /* Round off value to this many digits, -1 for no rounding */
+  int   slide_initial_slider_position;
+  int   slide_initial_coordinate_delta;
 
   guint flippable              : 1;
   guint inverted               : 1;
@@ -225,11 +225,11 @@ static void          gtk_range_direction_changed        (GtkWidget     *widget,
                                                          GtkTextDirection  previous_direction);
 static void          gtk_range_measure_trough           (GtkGizmo       *gizmo,
                                                          GtkOrientation  orientation,
-                                                         gint            for_size,
-                                                         gint           *minimum,
-                                                         gint           *natural,
-                                                         gint           *minimum_baseline,
-                                                         gint           *natural_baseline);
+                                                         int             for_size,
+                                                         int            *minimum,
+                                                         int            *natural,
+                                                         int            *minimum_baseline,
+                                                         int            *natural_baseline);
 static void          gtk_range_allocate_trough          (GtkGizmo            *gizmo,
                                                          int                  width,
                                                          int                  height,
@@ -943,8 +943,8 @@ gtk_range_get_range_rect (GtkRange     *range,
  **/
 void
 gtk_range_get_slider_range (GtkRange *range,
-                            gint     *slider_start,
-                            gint     *slider_end)
+                            int      *slider_start,
+                            int      *slider_end)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
   graphene_rect_t slider_bounds;
@@ -1303,16 +1303,16 @@ gtk_range_finalize (GObject *object)
 static void
 gtk_range_measure_trough (GtkGizmo       *gizmo,
                           GtkOrientation  orientation,
-                          gint            for_size,
-                          gint           *minimum,
-                          gint           *natural,
-                          gint           *minimum_baseline,
-                          gint           *natural_baseline)
+                          int             for_size,
+                          int            *minimum,
+                          int            *natural,
+                          int            *minimum_baseline,
+                          int            *natural_baseline)
 {
   GtkWidget *widget = gtk_widget_get_parent (GTK_WIDGET (gizmo));
   GtkRange *range = GTK_RANGE (widget);
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
-  gint min, nat;
+  int min, nat;
 
   gtk_widget_measure (priv->slider_widget,
                       orientation, -1,
@@ -1486,7 +1486,7 @@ clamp_dimensions (int        range_width,
                   GtkBorder *border,
                   gboolean   border_expands_horizontally)
 {
-  gint extra, shortage;
+  int extra, shortage;
 
   /* Width */
   extra = range_width - border->left - border->right - *width;
@@ -1720,8 +1720,8 @@ coord_to_value (GtkRange *range,
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
   gdouble frac;
   gdouble value;
-  gint    trough_length;
-  gint    slider_length;
+  int     trough_length;
+  int     slider_length;
   graphene_rect_t slider_bounds;
 
   if (!gtk_widget_compute_bounds (priv->slider_widget, priv->slider_widget, &slider_bounds))
@@ -1977,8 +1977,8 @@ gtk_range_click_gesture_released (GtkGestureClick *gesture,
 /* During a slide, move the slider as required given new mouse position */
 static void
 update_slider_position (GtkRange *range,
-                        gint      mouse_x,
-                        gint      mouse_y)
+                        int       mouse_x,
+                        int       mouse_y)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
   graphene_rect_t trough_bounds;
@@ -1990,7 +1990,7 @@ update_slider_position (GtkRange *range,
   gdouble mark_value;
   gdouble mark_delta;
   gdouble zoom;
-  gint i;
+  int i;
   double x, y;
 
   gtk_widget_translate_coordinates (GTK_WIDGET (range), priv->trough_widget,
@@ -2220,7 +2220,7 @@ update_autoscroll_mode (GtkRange *range,
   if (priv->zoom)
     {
       int width, height;
-      gint size, pos;
+      int size, pos;
 
       width = gtk_widget_get_width (GTK_WIDGET (range));
       height = gtk_widget_get_height (GTK_WIDGET (range));
@@ -2336,7 +2336,7 @@ apply_marks (GtkRange *range,
              gdouble  *newval)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
-  gint i;
+  int i;
   gdouble mark;
 
   for (i = 0; i < priv->n_marks; i++)
@@ -2635,7 +2635,7 @@ gtk_range_calc_marks (GtkRange *range)
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
   GdkRectangle slider;
   double x, y;
-  gint i;
+  int i;
 
   for (i = 0; i < priv->n_marks; i++)
     {
@@ -2670,7 +2670,7 @@ gtk_range_real_change_value (GtkRange      *range,
   if (priv->round_digits >= 0)
     {
       gdouble power;
-      gint i;
+      int i;
 
       i = priv->round_digits;
       power = 1;
@@ -2780,16 +2780,16 @@ _gtk_range_get_has_origin (GtkRange *range)
 void
 _gtk_range_set_stop_values (GtkRange *range,
                             gdouble  *values,
-                            gint      n_values)
+                            int       n_values)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
-  gint i;
+  int i;
 
   g_free (priv->marks);
   priv->marks = g_new (gdouble, n_values);
 
   g_free (priv->mark_pos);
-  priv->mark_pos = g_new (gint, n_values);
+  priv->mark_pos = g_new (int, n_values);
 
   priv->n_marks = n_values;
 
@@ -2799,16 +2799,16 @@ _gtk_range_set_stop_values (GtkRange *range,
   gtk_range_calc_marks (range);
 }
 
-gint
+int
 _gtk_range_get_stop_positions (GtkRange  *range,
-                               gint     **values)
+                               int      **values)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
 
   gtk_range_calc_marks (range);
 
   if (values)
-    *values = g_memdup (priv->mark_pos, priv->n_marks * sizeof (gint));
+    *values = g_memdup (priv->mark_pos, priv->n_marks * sizeof (int));
 
   return priv->n_marks;
 }
@@ -2823,7 +2823,7 @@ _gtk_range_get_stop_positions (GtkRange  *range,
  */
 void
 gtk_range_set_round_digits (GtkRange *range,
-                            gint      round_digits)
+                            int       round_digits)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
 
@@ -2846,7 +2846,7 @@ gtk_range_set_round_digits (GtkRange *range,
  *
  * Returns: the number of digits to round to
  */
-gint
+int
 gtk_range_get_round_digits (GtkRange *range)
 {
   GtkRangePrivate *priv = gtk_range_get_instance_private (range);
index f62b920c5c8306a6de162b718ccf1956b7a10c12..2a256381b09eba3cb4081e160fbe83c020b1fa8b 100644 (file)
@@ -109,8 +109,8 @@ void               gtk_range_get_range_rect                (GtkRange      *range
                                                             GdkRectangle  *range_rect);
 GDK_AVAILABLE_IN_ALL
 void               gtk_range_get_slider_range              (GtkRange      *range,
-                                                            gint          *slider_start,
-                                                            gint          *slider_end);
+                                                            int           *slider_start,
+                                                            int           *slider_end);
 
 GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_increments                (GtkRange      *range,
@@ -143,9 +143,9 @@ GDK_AVAILABLE_IN_ALL
 gdouble            gtk_range_get_fill_level                (GtkRange      *range);
 GDK_AVAILABLE_IN_ALL
 void               gtk_range_set_round_digits              (GtkRange      *range,
-                                                            gint           round_digits);
+                                                            int            round_digits);
 GDK_AVAILABLE_IN_ALL
-gint                gtk_range_get_round_digits              (GtkRange      *range);
+int                 gtk_range_get_round_digits              (GtkRange      *range);
 
 
 G_END_DECLS
index 40ee468b9c222f3c72bc4dff2809b58cf1c759f1..d50ed52d7fa4e573aa77201e4a06bd240a755674 100644 (file)
@@ -37,9 +37,9 @@ void               _gtk_range_set_has_origin               (GtkRange      *range
 gboolean           _gtk_range_get_has_origin               (GtkRange      *range);
 void               _gtk_range_set_stop_values              (GtkRange      *range,
                                                             gdouble       *values,
-                                                            gint           n_values);
-gint               _gtk_range_get_stop_positions           (GtkRange      *range,
-                                                            gint         **values);
+                                                            int            n_values);
+int                _gtk_range_get_stop_positions           (GtkRange      *range,
+                                                            int          **values);
 
 GtkWidget         *gtk_range_get_slider_widget             (GtkRange *range);
 GtkWidget         *gtk_range_get_trough_widget             (GtkRange *range);
index fcd50dce8fd33f93ae3a404e5fb426d1daf7e493..8a6ae8c23df2a8637614522d81533cd6016d8cc0 100644 (file)
@@ -159,7 +159,7 @@ struct _GtkRecentInfo
 
   gboolean is_private;
 
-  gint ref_count;
+  int ref_count;
 };
 
 struct _GtkRecentManagerPrivate
@@ -168,7 +168,7 @@ struct _GtkRecentManagerPrivate
 
   guint is_dirty : 1;
 
-  gint size;
+  int size;
 
   GBookmarkFile *recent_items;
 
@@ -210,9 +210,9 @@ static void     gtk_recent_manager_real_changed        (GtkRecentManager  *manag
 static void     gtk_recent_manager_set_filename        (GtkRecentManager  *manager,
                                                         const gchar       *filename);
 static void     gtk_recent_manager_clamp_to_age        (GtkRecentManager  *manager,
-                                                        gint               age);
+                                                        int                age);
 static void     gtk_recent_manager_clamp_to_size       (GtkRecentManager  *manager,
-                                                        const gint         size);
+                                                        const int          size);
 
 static void     gtk_recent_manager_enabled_changed     (GtkRecentManager  *manager);
 
@@ -453,8 +453,8 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager)
       else
         {
           GtkSettings *settings;
-          gint age;
-          gint max_size = MAX_LIST_SIZE;
+          int age;
+          int max_size = MAX_LIST_SIZE;
           gboolean enabled;
 
           settings = gtk_settings_get_default ();
@@ -657,7 +657,7 @@ build_recent_items_list (GtkRecentManager *manager)
 {
   GtkRecentManagerPrivate *priv = manager->priv;
   GError *read_error;
-  gint size;
+  int size;
 
   if (!priv->recent_items)
     {
@@ -970,7 +970,7 @@ gtk_recent_manager_add_full (GtkRecentManager    *manager,
 
   if (data->groups && ((char*)data->groups)[0] != '\0')
     {
-      gint j;
+      int j;
 
       for (j = 0; (data->groups)[j] != NULL; j++)
         g_bookmark_file_add_group (priv->recent_items, uri, (data->groups)[j]);
@@ -1344,12 +1344,12 @@ purge_recent_items_list (GtkRecentManager  *manager,
  * Returns: the number of items that have been removed from the
  *   recently used resources list
  */
-gint
+int
 gtk_recent_manager_purge_items (GtkRecentManager  *manager,
                                 GError           **error)
 {
   GtkRecentManagerPrivate *priv;
-  gint count, purged;
+  int count, purged;
 
   g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), -1);
 
@@ -1412,7 +1412,7 @@ gtk_recent_manager_changed (GtkRecentManager *manager)
 
 static void
 gtk_recent_manager_clamp_to_age (GtkRecentManager *manager,
-                                 gint              age)
+                                 int               age)
 {
   GtkRecentManagerPrivate *priv = manager->priv;
   gchar **uris;
@@ -1430,10 +1430,10 @@ gtk_recent_manager_clamp_to_age (GtkRecentManager *manager,
     {
       const gchar *uri = uris[i];
       time_t modified;
-      gint item_age;
+      int item_age;
 
       modified = g_bookmark_file_get_modified (priv->recent_items, uri, NULL);
-      item_age = (gint) ((now - modified) / (60 * 60 * 24));
+      item_age = (int) ((now - modified) / (60 * 60 * 24));
       if (item_age > age)
         g_bookmark_file_remove_item (priv->recent_items, uri, NULL);
     }
@@ -1443,7 +1443,7 @@ gtk_recent_manager_clamp_to_age (GtkRecentManager *manager,
 
 static void
 gtk_recent_manager_clamp_to_size (GtkRecentManager *manager,
-                                  const gint        size)
+                                  const int         size)
 {
   GtkRecentManagerPrivate *priv = manager->priv;
   gchar **uris;
@@ -2176,11 +2176,11 @@ gtk_recent_info_get_uri_display (GtkRecentInfo *info)
  * Returns: a positive integer containing the number of days
  *   elapsed since the time this resource was last modified
  */
-gint
+int
 gtk_recent_info_get_age (GtkRecentInfo *info)
 {
   time_t now, delta;
-  gint retval;
+  int retval;
 
   g_return_val_if_fail (info != NULL, -1);
 
@@ -2188,7 +2188,7 @@ gtk_recent_info_get_age (GtkRecentInfo *info)
 
   delta = now - info->modified;
 
-  retval = (gint) (delta / (60 * 60 * 24));
+  retval = (int) (delta / (60 * 60 * 24));
 
   return retval;
 }
index cd82c6b9f5474f0343ac55740ba0f3144038b256..9167ab8bef4c66652d7b56ce76748a82d7b36217 100644 (file)
@@ -186,7 +186,7 @@ gboolean          gtk_recent_manager_move_item      (GtkRecentManager     *manag
 GDK_AVAILABLE_IN_ALL
 GList *           gtk_recent_manager_get_items      (GtkRecentManager     *manager);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_recent_manager_purge_items    (GtkRecentManager     *manager,
+int               gtk_recent_manager_purge_items    (GtkRecentManager     *manager,
                                                     GError              **error);
 
 
@@ -245,7 +245,7 @@ gchar *               gtk_recent_info_get_short_name       (GtkRecentInfo  *info
 GDK_AVAILABLE_IN_ALL
 gchar *               gtk_recent_info_get_uri_display      (GtkRecentInfo  *info) G_GNUC_MALLOC;
 GDK_AVAILABLE_IN_ALL
-gint                  gtk_recent_info_get_age              (GtkRecentInfo  *info);
+int                   gtk_recent_info_get_age              (GtkRecentInfo  *info);
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_recent_info_is_local             (GtkRecentInfo  *info);
 GDK_AVAILABLE_IN_ALL
index a327af50993f400c8d3e56ca682dad0720d3e57e..3b1055970a5d01fea7da7f010ac0a7b361db5024 100644 (file)
@@ -42,10 +42,10 @@ void    gtk_css_style_snapshot_icon_paintable   (GtkCssStyle            *style,
 
 void    gtk_css_style_render_icon_get_extents   (GtkCssStyle            *style,
                                                  GdkRectangle           *extents,
-                                                 gint                    x,
-                                                 gint                    y,
-                                                 gint                    width,
-                                                 gint                    height);
+                                                 int                     x,
+                                                 int                     y,
+                                                 int                     width,
+                                                 int                     height);
 
 G_END_DECLS
 
index 801c88c6a34008616424be9b54be6b30e139dfc1..d022863557f13c2db793562506250224b55ba36a 100644 (file)
@@ -166,7 +166,7 @@ typedef struct {
 } Arc;
 
 static inline guint
-mem_hash (gconstpointer v, gint len)
+mem_hash (gconstpointer v, int len)
 {
   const signed char *p;
   const signed char *end;
index 6e739f1b46149c69d1bdd453665909fd5c00f867..2e3b3374ab1b8c629b04beee2e6bfebbb03d83a5 100644 (file)
@@ -147,7 +147,7 @@ struct _GtkScalePrivate
   GtkWidget    *top_marks_widget;
   GtkWidget    *bottom_marks_widget;
 
-  gint          digits;
+  int           digits;
 
   GtkScaleFormatValueFunc format_value_func;
   gpointer format_value_func_user_data;
@@ -199,8 +199,8 @@ static void     gtk_scale_get_range_border        (GtkRange       *range,
                                                    GtkBorder      *border);
 static void     gtk_scale_finalize                (GObject        *object);
 static void     gtk_scale_real_get_layout_offsets (GtkScale       *scale,
-                                                   gint           *x,
-                                                   gint           *y);
+                                                   int            *x,
+                                                   int            *y);
 static void     gtk_scale_buildable_interface_init   (GtkBuildableIface  *iface);
 static gboolean gtk_scale_buildable_custom_tag_start (GtkBuildable       *buildable,
                                                       GtkBuilder         *builder,
@@ -222,11 +222,11 @@ G_DEFINE_TYPE_WITH_CODE (GtkScale, gtk_scale, GTK_TYPE_RANGE,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
                                                 gtk_scale_buildable_interface_init))
 
-static gint
+static int
 compare_marks (gconstpointer a, gconstpointer b, gpointer data)
 {
   gboolean inverted = GPOINTER_TO_INT (data);
-  gint val;
+  int val;
   const GtkScaleMark *ma, *mb;
 
   val = inverted ? -1 : 1;
@@ -287,7 +287,7 @@ gtk_scale_notify (GObject    *object,
     {
       GtkScaleMark *mark;
       GSList *m;
-      gint i, n;
+      int i, n;
       gdouble *values;
 
       priv->marks = g_slist_sort_with_data (priv->marks,
@@ -950,7 +950,7 @@ gtk_scale_new_with_range (GtkOrientation orientation,
                           gdouble        step)
 {
   GtkAdjustment *adj;
-  gint digits;
+  int digits;
 
   g_return_val_if_fail (min < max, NULL);
   g_return_val_if_fail (step != 0.0, NULL);
@@ -963,7 +963,7 @@ gtk_scale_new_with_range (GtkOrientation orientation,
     }
   else
     {
-      digits = abs ((gint) floor (log10 (fabs (step))));
+      digits = abs ((int) floor (log10 (fabs (step))));
       if (digits > 5)
         digits = 5;
     }
@@ -994,7 +994,7 @@ gtk_scale_new_with_range (GtkOrientation orientation,
  */
 void
 gtk_scale_set_digits (GtkScale *scale,
-                     gint      digits)
+                     int       digits)
 {
   GtkScalePrivate *priv = gtk_scale_get_instance_private (scale);
   GtkRange *range;
@@ -1025,7 +1025,7 @@ gtk_scale_set_digits (GtkScale *scale,
  *
  * Returns: the number of decimal places that are displayed
  */
-gint
+int
 gtk_scale_get_digits (GtkScale *scale)
 {
   GtkScalePrivate *priv = gtk_scale_get_instance_private (scale);
@@ -1314,11 +1314,11 @@ gtk_scale_get_range_border (GtkRange  *range,
 static void
 gtk_scale_measure_mark (GtkGizmo       *gizmo,
                         GtkOrientation  orientation,
-                        gint            for_size,
-                        gint           *minimum,
-                        gint           *natural,
-                        gint           *minimum_baseline,
-                        gint           *natural_baseline)
+                        int             for_size,
+                        int            *minimum,
+                        int            *natural,
+                        int            *minimum_baseline,
+                        int            *natural_baseline)
 {
   GtkScaleMark *mark = g_object_get_data (G_OBJECT (gizmo), "mark");
 
@@ -1343,11 +1343,11 @@ gtk_scale_measure_mark (GtkGizmo       *gizmo,
 static void
 gtk_scale_measure_marks (GtkGizmo       *gizmo,
                          GtkOrientation  orientation,
-                         gint            for_size,
-                         gint           *minimum,
-                         gint           *natural,
-                         gint           *minimum_baseline,
-                         gint           *natural_baseline)
+                         int             for_size,
+                         int            *minimum,
+                         int            *natural,
+                         int            *minimum_baseline,
+                         int            *natural_baseline)
 {
   GtkWidget *widget = GTK_WIDGET (gizmo);
   GtkScale *scale = GTK_SCALE (gtk_widget_get_parent (widget));;
@@ -1464,8 +1464,8 @@ gtk_scale_measure (GtkWidget      *widget,
 
 static void
 gtk_scale_real_get_layout_offsets (GtkScale *scale,
-                                   gint     *x,
-                                   gint     *y)
+                                   int      *x,
+                                   int      *y)
 {
   GtkScalePrivate *priv = gtk_scale_get_instance_private (scale);
   graphene_rect_t value_bounds;
@@ -1486,7 +1486,7 @@ gtk_scale_real_get_layout_offsets (GtkScale *scale,
 
 static gchar *
 weed_out_neg_zero (gchar *str,
-                   gint   digits)
+                   int    digits)
 {
   if (str[0] == '-')
     {
@@ -1571,11 +1571,11 @@ gtk_scale_get_layout (GtkScale *scale)
  */
 void 
 gtk_scale_get_layout_offsets (GtkScale *scale,
-                              gint     *x,
-                              gint     *y)
+                              int      *x,
+                              int      *y)
 {
-  gint local_x = 0; 
-  gint local_y = 0;
+  int local_x = 0; 
+  int local_y = 0;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
 
@@ -1663,7 +1663,7 @@ gtk_scale_add_mark (GtkScale        *scale,
   GtkScaleMark *mark;
   GSList *m;
   gdouble *values;
-  gint n, i;
+  int n, i;
   GtkWidget *marks_widget;
 
   g_return_if_fail (GTK_IS_SCALE (scale));
index 36f5fc2bfce7310fbeed941f5bd9f6c9a1eb3dfc..0d1422fbb562c9f5ce934b3bf5959dbb7479f380 100644 (file)
@@ -56,8 +56,8 @@ struct _GtkScaleClass
   GtkRangeClass parent_class;
 
   void (* get_layout_offsets) (GtkScale *scale,
-                               gint     *x,
-                               gint     *y);
+                               int      *x,
+                               int      *y);
 
   /*< private >*/
 
@@ -91,9 +91,9 @@ GtkWidget       * gtk_scale_new_with_range     (GtkOrientation   orientation,
                                                 gdouble          step);
 GDK_AVAILABLE_IN_ALL
 void              gtk_scale_set_digits         (GtkScale        *scale,
-                                                gint             digits);
+                                                int              digits);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_scale_get_digits         (GtkScale        *scale);
+int               gtk_scale_get_digits         (GtkScale        *scale);
 GDK_AVAILABLE_IN_ALL
 void              gtk_scale_set_draw_value     (GtkScale        *scale,
                                                 gboolean         draw_value);
@@ -114,8 +114,8 @@ GDK_AVAILABLE_IN_ALL
 PangoLayout     * gtk_scale_get_layout         (GtkScale        *scale);
 GDK_AVAILABLE_IN_ALL
 void              gtk_scale_get_layout_offsets (GtkScale        *scale,
-                                                gint            *x,
-                                                gint            *y);
+                                                int             *x,
+                                                int             *y);
 
 GDK_AVAILABLE_IN_ALL
 void              gtk_scale_add_mark           (GtkScale        *scale,
index bb74c4f17b167c2abbf63807f6ecf882572b7e32..751a76ae5d5a7ca2d0b538b4a956a0e5f5e3c0f1 100644 (file)
@@ -265,10 +265,10 @@ typedef struct
   guint    propagate_natural_height : 1;
   guint    smooth_scroll            : 1;
 
-  gint     min_content_width;
-  gint     min_content_height;
-  gint     max_content_width;
-  gint     max_content_height;
+  int      min_content_width;
+  int      min_content_height;
+  int      max_content_width;
+  int      max_content_height;
 
   guint scroll_events_overshoot_id;
 
@@ -391,8 +391,8 @@ static void _gtk_scrolled_window_set_adjustment_value  (GtkScrolledWindow *scrol
 static void gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window);
 
 static gboolean _gtk_scrolled_window_get_overshoot (GtkScrolledWindow *scrolled_window,
-                                                    gint              *overshoot_x,
-                                                    gint              *overshoot_y);
+                                                    int               *overshoot_x,
+                                                    int               *overshoot_y);
 
 static void     gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window);
 
@@ -931,7 +931,7 @@ static void
 gtk_scrolled_window_invalidate_overshoot (GtkScrolledWindow *scrolled_window)
 {
   GtkAllocation child_allocation;
-  gint overshoot_x, overshoot_y;
+  int overshoot_x, overshoot_y;
 
   if (!_gtk_scrolled_window_get_overshoot (scrolled_window, &overshoot_x, &overshoot_y))
     return;
@@ -1121,7 +1121,7 @@ coords_close_to_indicator (GtkScrolledWindow *sw,
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (sw);
   graphene_rect_t indicator_bounds;
-  gint distance;
+  int distance;
 
   if (!gtk_widget_compute_bounds (indicator->scrollbar, GTK_WIDGET (sw), &indicator_bounds))
     return FALSE;
@@ -1467,8 +1467,8 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
   GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkAllocation child_allocation;
-  gint sb_width;
-  gint sb_height;
+  int sb_width;
+  int sb_height;
 
   /* Get possible scrollbar dimensions */
   gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
@@ -1490,8 +1490,8 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget,
 
   if (priv->child && gtk_widget_get_visible (priv->child))
     {
-      gint child_scroll_width;
-      gint child_scroll_height;
+      int child_scroll_width;
+      int child_scroll_height;
       gboolean previous_hvis;
       gboolean previous_vvis;
       guint count = 0;
@@ -1735,8 +1735,8 @@ gtk_scrolled_window_measure (GtkWidget      *widget,
             }
           else
             {
-              gint min = priv->min_content_width >= 0 ? priv->min_content_width : 0;
-              gint max = priv->max_content_width >= 0 ? priv->max_content_width : G_MAXINT;
+              int min = priv->min_content_width >= 0 ? priv->min_content_width : 0;
+              int max = priv->max_content_width >= 0 ? priv->max_content_width : G_MAXINT;
 
               minimum_req = CLAMP (minimum_req, min, max);
               natural_req = CLAMP (natural_req, min, max);
@@ -1753,8 +1753,8 @@ gtk_scrolled_window_measure (GtkWidget      *widget,
             }
           else
             {
-              gint min = priv->min_content_height >= 0 ? priv->min_content_height : 0;
-              gint max = priv->max_content_height >= 0 ? priv->max_content_height : G_MAXINT;
+              int min = priv->min_content_height >= 0 ? priv->min_content_height : 0;
+              int max = priv->max_content_height >= 0 ? priv->max_content_height : G_MAXINT;
 
               minimum_req = CLAMP (minimum_req, min, max);
               natural_req = CLAMP (natural_req, min, max);
@@ -1859,7 +1859,7 @@ gtk_scrolled_window_snapshot_overshoot (GtkScrolledWindow *scrolled_window,
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkWidget *widget = GTK_WIDGET (scrolled_window);
-  gint overshoot_x, overshoot_y;
+  int overshoot_x, overshoot_y;
   GtkStyleContext *context;
   GdkRectangle rect;
 
@@ -1963,7 +1963,7 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
     g_quark_from_static_string (GTK_STYLE_CLASS_TOP),
     g_quark_from_static_string (GTK_STYLE_CLASS_BOTTOM),
   };
-  gint i;
+  int i;
 
   gtk_widget_set_focusable (widget, TRUE);
 
@@ -2971,8 +2971,8 @@ gtk_scrolled_window_relative_allocation (GtkScrolledWindow *scrolled_window,
                                          GtkAllocation     *allocation)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
-  gint sb_width;
-  gint sb_height;
+  int sb_width;
+  int sb_height;
   int width, height;
 
   g_return_if_fail (scrolled_window != NULL);
@@ -3023,8 +3023,8 @@ gtk_scrolled_window_relative_allocation (GtkScrolledWindow *scrolled_window,
 
 static gboolean
 _gtk_scrolled_window_get_overshoot (GtkScrolledWindow *scrolled_window,
-                                    gint              *overshoot_x,
-                                    gint              *overshoot_y)
+                                    int               *overshoot_x,
+                                    int               *overshoot_y)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkAdjustment *vadjustment, *hadjustment;
@@ -3123,7 +3123,7 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window,
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
   GtkAllocation child_allocation, content_allocation;
   GtkWidget *widget = GTK_WIDGET (scrolled_window);
-  gint sb_height, sb_width;
+  int sb_height, sb_width;
 
   gtk_scrolled_window_inner_allocation (scrolled_window, &content_allocation);
   gtk_widget_measure (priv->vscrollbar, GTK_ORIENTATION_HORIZONTAL, -1,
@@ -3808,7 +3808,7 @@ gtk_scrolled_window_realize (GtkWidget *widget)
  *
  * Returns: the minimum content width
  */
-gint
+int
 gtk_scrolled_window_get_min_content_width (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
@@ -3832,7 +3832,7 @@ gtk_scrolled_window_get_min_content_width (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_min_content_width (GtkScrolledWindow *scrolled_window,
-                                           gint               width)
+                                           int                width)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -3858,7 +3858,7 @@ gtk_scrolled_window_set_min_content_width (GtkScrolledWindow *scrolled_window,
  *
  * Returns: the minimal content height
  */
-gint
+int
 gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
@@ -3882,7 +3882,7 @@ gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_min_content_height (GtkScrolledWindow *scrolled_window,
-                                            gint               height)
+                                            int                height)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -3957,7 +3957,7 @@ gtk_scrolled_window_get_overlay_scrolling (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_max_content_width (GtkScrolledWindow *scrolled_window,
-                                           gint               width)
+                                           int                width)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -3981,7 +3981,7 @@ gtk_scrolled_window_set_max_content_width (GtkScrolledWindow *scrolled_window,
  *
  * Returns: the maximum content width, or -1
  */
-gint
+int
 gtk_scrolled_window_get_max_content_width (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
@@ -4005,7 +4005,7 @@ gtk_scrolled_window_get_max_content_width (GtkScrolledWindow *scrolled_window)
  */
 void
 gtk_scrolled_window_set_max_content_height (GtkScrolledWindow *scrolled_window,
-                                            gint               height)
+                                            int                height)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
 
@@ -4029,7 +4029,7 @@ gtk_scrolled_window_set_max_content_height (GtkScrolledWindow *scrolled_window,
  *
  * Returns: the maximum content height, or -1
  */
-gint
+int
 gtk_scrolled_window_get_max_content_height (GtkScrolledWindow *scrolled_window)
 {
   GtkScrolledWindowPrivate *priv = gtk_scrolled_window_get_instance_private (scrolled_window);
index 5d1a1d66e1480b1da1c2396fa964d462396abd61..06a0c778a4c5cc90203255116924e2d75d563e18 100644 (file)
@@ -130,15 +130,15 @@ GDK_AVAILABLE_IN_ALL
 gboolean       gtk_scrolled_window_get_has_frame     (GtkScrolledWindow *scrolled_window);
 
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_min_content_width  (GtkScrolledWindow *scrolled_window);
+int            gtk_scrolled_window_get_min_content_width  (GtkScrolledWindow *scrolled_window);
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_min_content_width  (GtkScrolledWindow *scrolled_window,
-                                                           gint               width);
+                                                           int                width);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window);
+int            gtk_scrolled_window_get_min_content_height (GtkScrolledWindow *scrolled_window);
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_min_content_height (GtkScrolledWindow *scrolled_window,
-                                                           gint               height);
+                                                           int                height);
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_kinetic_scrolling  (GtkScrolledWindow *scrolled_window,
                                                            gboolean           kinetic_scrolling);
@@ -159,15 +159,15 @@ gboolean       gtk_scrolled_window_get_overlay_scrolling (GtkScrolledWindow   *s
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_max_content_width  (GtkScrolledWindow *scrolled_window,
-                                                           gint               width);
+                                                           int                width);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_max_content_width  (GtkScrolledWindow *scrolled_window);
+int            gtk_scrolled_window_get_max_content_width  (GtkScrolledWindow *scrolled_window);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_max_content_height (GtkScrolledWindow *scrolled_window,
-                                                           gint               height);
+                                                           int                height);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_scrolled_window_get_max_content_height (GtkScrolledWindow *scrolled_window);
+int            gtk_scrolled_window_get_max_content_height (GtkScrolledWindow *scrolled_window);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_scrolled_window_set_propagate_natural_width  (GtkScrolledWindow *scrolled_window,
index fe1af8e9bfecb0d010ac8a34ef70fcdab1c5401b..7fc6c8343f998ce996f63d8fa265ebeccc5ff58d 100644 (file)
@@ -114,7 +114,7 @@ struct _GtkSettings
   GdkDisplay *display;
   GSList *style_cascades;
   GtkCssProvider *theme_provider;
-  gint font_size;
+  int font_size;
   gboolean font_size_absolute;
   gchar *font_family;
   cairo_font_options_t *font_options;
@@ -1006,7 +1006,7 @@ gtk_settings_finalize (GObject *object)
 
 GtkStyleCascade *
 _gtk_settings_get_style_cascade (GtkSettings *settings,
-                                 gint         scale)
+                                 int          scale)
 {
   GtkStyleCascade *new_cascade;
   GSList *list;
@@ -1459,8 +1459,8 @@ gtk_settings_set_property_value_internal (GtkSettings            *settings,
 static void
 settings_update_double_click (GtkSettings *settings)
 {
-  gint double_click_time;
-  gint double_click_distance;
+  int double_click_time;
+  int double_click_distance;
 
   g_object_get (settings,
                 "gtk-double-click-time", &double_click_time,
@@ -1475,7 +1475,7 @@ static void
 settings_update_cursor_theme (GtkSettings *settings)
 {
   gchar *theme = NULL;
-  gint size = 0;
+  int size = 0;
 
   g_object_get (settings,
                 "gtk-cursor-theme-name", &theme,
@@ -1491,10 +1491,10 @@ settings_update_cursor_theme (GtkSettings *settings)
 static void
 settings_update_font_options (GtkSettings *settings)
 {
-  gint hinting;
+  int hinting;
   gchar *hint_style_str;
   cairo_hint_style_t hint_style;
-  gint antialias;
+  int antialias;
   cairo_antialias_t antialias_mode;
   gchar *rgba_str;
   cairo_subpixel_order_t subpixel_order;
@@ -1734,7 +1734,7 @@ gtk_settings_load_from_key_file (GtkSettings       *settings,
   GKeyFile *keyfile;
   gchar **keys;
   gsize n_keys;
-  gint i;
+  int i;
 
   error = NULL;
   keys = NULL;
@@ -1793,7 +1793,7 @@ gtk_settings_load_from_key_file (GtkSettings       *settings,
         case G_TYPE_INT:
         case G_TYPE_UINT:
           {
-            gint i_val;
+            int i_val;
 
             g_value_init (&svalue.value, G_TYPE_LONG);
             i_val = g_key_file_get_integer (keyfile, "Settings", key, &error);
@@ -1906,7 +1906,7 @@ static void
 settings_update_xsettings (GtkSettings *settings)
 {
   GParamSpec **pspecs;
-  gint i;
+  int i;
 
   pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (settings), NULL);
   for (i = 0; pspecs[i]; i++)
@@ -1991,7 +1991,7 @@ gtk_settings_get_enable_animations (GtkSettings *settings)
   return g_value_get_boolean (&svalue->value);
 }
 
-gint
+int
 gtk_settings_get_dnd_drag_threshold (GtkSettings *settings)
 {
   GtkSettingsPropertyValue *svalue = &settings->property_values[PROP_DND_DRAG_THRESHOLD - 1];
@@ -2031,7 +2031,7 @@ gtk_settings_get_font_family (GtkSettings *settings)
   return settings->font_family;
 }
 
-gint
+int
 gtk_settings_get_font_size (GtkSettings *settings)
 {
   settings_update_font_name (settings);
index 73a362a1be6f615a611bdd479c701d8edd10bb46..f39963939c80c6f2f25c2708dce0faac74e576cb 100644 (file)
@@ -30,7 +30,7 @@ const cairo_font_options_t *
                     gtk_settings_get_font_options            (GtkSettings            *settings);
 GdkDisplay         *_gtk_settings_get_display                (GtkSettings            *settings);
 GtkStyleCascade    *_gtk_settings_get_style_cascade          (GtkSettings            *settings,
-                                                              gint                    scale);
+                                                              int                     scale);
 
 typedef enum
 {
@@ -44,9 +44,9 @@ GtkSettingsSource  _gtk_settings_get_setting_source (GtkSettings *settings,
                                                      const gchar *name);
 
 gboolean gtk_settings_get_enable_animations  (GtkSettings *settings);
-gint     gtk_settings_get_dnd_drag_threshold (GtkSettings *settings);
+int      gtk_settings_get_dnd_drag_threshold (GtkSettings *settings);
 const gchar *gtk_settings_get_font_family    (GtkSettings *settings);
-gint         gtk_settings_get_font_size      (GtkSettings *settings);
+int          gtk_settings_get_font_size      (GtkSettings *settings);
 gboolean     gtk_settings_get_font_size_is_absolute (GtkSettings *settings);
 
 G_END_DECLS
index 458a091cd2378a18d626fd4ca2c15debb64b47f2..db54b35811ad08460da3a9a12bd6296f51215082 100644 (file)
@@ -131,7 +131,7 @@ get_labels (guint key, GdkModifierType modifier, guint *n_mods)
   gchar key_label[6];
   const gchar *tmp;
   gunichar ch;
-  gint i = 0;
+  int i = 0;
   gchar **retval;
 
   if (modifier & GDK_SHIFT_MASK)
@@ -260,7 +260,7 @@ display_shortcut (GtkWidget       *self,
                   GdkModifierType  modifier)
 {
   gchar **keys = NULL;
-  gint i;
+  int i;
   guint n_mods;
 
   keys = get_labels (key, modifier, &n_mods);
@@ -288,7 +288,7 @@ parse_combination (GtkShortcutLabel *self,
                    const gchar      *str)
 {
   gchar **accels;
-  gint k;
+  int k;
   GdkModifierType modifier = 0;
   guint key = 0;
   gboolean retval = TRUE;
@@ -316,7 +316,7 @@ parse_sequence (GtkShortcutLabel *self,
                 const gchar      *str)
 {
   gchar **accels;
-  gint k;
+  int k;
   gboolean retval = TRUE;
 
   accels = g_strsplit (str, "+", 0);
@@ -377,7 +377,7 @@ static void
 gtk_shortcut_label_rebuild (GtkShortcutLabel *self)
 {
   gchar **accels;
-  gint k;
+  int k;
 
   clear_children (self);
 
index 5f5be70582fe5d4711b246a86d6f654a2661e24d..bc1c06c7bf3202f7d4beb3bc6c92a1440edec76d 100644 (file)
@@ -78,7 +78,7 @@ struct _GtkShortcutsSectionClass
   GtkBoxClass parent_class;
 
   gboolean (* change_current_page) (GtkShortcutsSection *self,
-                                    gint                 offset);
+                                    int                  offset);
 
 };
 
@@ -117,7 +117,7 @@ static void gtk_shortcuts_section_filter_groups    (GtkShortcutsSection *self);
 static void gtk_shortcuts_section_reflow_groups    (GtkShortcutsSection *self);
 
 static gboolean gtk_shortcuts_section_change_current_page (GtkShortcutsSection *self,
-                                                           gint                 offset);
+                                                           int                  offset);
 
 static void gtk_shortcuts_section_pan_gesture_pan (GtkGesturePan       *gesture,
                                                    GtkPanDirection      direction,
@@ -729,7 +729,7 @@ gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self)
 
 static gboolean
 gtk_shortcuts_section_change_current_page (GtkShortcutsSection *self,
-                                           gint                 offset)
+                                           int                  offset)
 {
   GtkWidget *child;
 
index 8364932c59637dc22dd7d0c192b963cd493500d9..46e2f9cc96898bc74677656f08ab82494217c460 100644 (file)
@@ -362,7 +362,7 @@ gtk_shortcut_trigger_equal (gconstpointer trigger1,
  *     @trigger1 is found, respectively, to be less than, to match,
  *     or be greater than @trigger2.
  **/
-gint
+int
 gtk_shortcut_trigger_compare (gconstpointer trigger1,
                               gconstpointer trigger2)
 {
index 2701429c98bcb467a05c25457d4e7a02cbfae7e8..eeda11939edf8f58396f3d0e9cb8e5e5da25716e 100644 (file)
@@ -61,7 +61,7 @@ GDK_AVAILABLE_IN_ALL
 gboolean                gtk_shortcut_trigger_equal              (gconstpointer       trigger1,
                                                                  gconstpointer       trigger2);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_shortcut_trigger_compare            (gconstpointer       trigger1,
+int                     gtk_shortcut_trigger_compare            (gconstpointer       trigger1,
                                                                  gconstpointer       trigger2);
 
 GDK_AVAILABLE_IN_ALL
index fbd90b66bb082777b8fdcb4931ca507cdf2d1790..1177722c852490712a374e56428d54a1d0bc499d 100644 (file)
@@ -45,7 +45,7 @@ struct _GtkSidebarRow
   GtkWidget *label_widget;
   gboolean ejectable;
   GtkWidget *eject_button;
-  gint order_index;
+  int order_index;
   GtkPlacesSidebarSectionType section_type;
   GtkPlacesSidebarPlaceType place_type;
   gchar *uri;
@@ -91,7 +91,7 @@ cloud_row_update (GtkSidebarRow *self)
 {
   CloudProvidersAccount *account;
   GIcon *end_icon;
-  gint provider_status;
+  int provider_status;
 
   account = CLOUD_PROVIDERS_ACCOUNT (self->cloud_provider_account);
   provider_status = cloud_providers_account_get_status (account);
index 19999fece47ad70263d0eb5c8509c8972c7aecf4..51c76270248f1b89329f48030cc0684890319f20 100644 (file)
@@ -157,7 +157,7 @@ static void
 add_widget_to_closure (GHashTable *widgets,
                        GHashTable *groups,
                        GtkWidget  *widget,
-                      gint        orientation)
+                      int         orientation)
 {
   GSList *tmp_groups, *tmp_widgets;
 
@@ -441,8 +441,8 @@ gtk_size_group_get_widgets (GtkSizeGroup *size_group)
 
 typedef struct {
   gchar *name;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } ItemData;
 
 static void
index 269bcd0394861307153fd5177bb9bde8bca92c6f..5fc499c4b0258b4ee0796007941f00daaad4ff45 100644 (file)
@@ -82,7 +82,7 @@ fetch_request_mode (GtkWidget *widget)
     return GTK_WIDGET_GET_CLASS (widget)->get_request_mode (widget);
 }
 
-static gint
+static int
 get_number (GtkCssValue *value)
 {
   double d = _gtk_css_number_value_get (value, 100);
@@ -133,18 +133,18 @@ get_box_padding (GtkCssStyle *style,
 static void
 gtk_widget_query_size_for_orientation (GtkWidget        *widget,
                                        GtkOrientation    orientation,
-                                       gint              for_size,
-                                       gint             *minimum,
-                                       gint             *natural,
-                                       gint             *minimum_baseline,
-                                       gint             *natural_baseline)
+                                       int               for_size,
+                                       int              *minimum,
+                                       int              *natural,
+                                       int              *minimum_baseline,
+                                       int              *natural_baseline)
 {
   const gboolean baselines_requested = (minimum_baseline != NULL || natural_baseline != NULL);
   SizeRequestCache *cache;
-  gint min_size = 0;
-  gint nat_size = 0;
-  gint min_baseline = -1;
-  gint nat_baseline = -1;
+  int min_size = 0;
+  int nat_size = 0;
+  int min_baseline = -1;
+  int nat_baseline = -1;
   gboolean found_in_cache;
 
   gtk_widget_ensure_resize (widget);
@@ -647,7 +647,7 @@ gtk_widget_get_preferred_size (GtkWidget      *widget,
     }
 }
 
-static gint
+static int
 compare_gap (gconstpointer p1,
             gconstpointer p2,
             gpointer      data)
@@ -656,14 +656,14 @@ compare_gap (gconstpointer p1,
   const guint *c1 = p1;
   const guint *c2 = p2;
 
-  const gint d1 = MAX (sizes[*c1].natural_size -
+  const int d1 = MAX (sizes[*c1].natural_size -
                        sizes[*c1].minimum_size,
                        0);
-  const gint d2 = MAX (sizes[*c2].natural_size -
+  const int d2 = MAX (sizes[*c2].natural_size -
                        sizes[*c2].minimum_size,
                        0);
 
-  gint delta = (d2 - d1);
+  int delta = (d2 - d1);
 
   if (0 == delta)
     delta = (*c2 - *c1);
@@ -689,13 +689,13 @@ compare_gap (gconstpointer p1,
  * Returns: The remainder of @extra_space after redistributing space
  * to @sizes.
  */
-gint
-gtk_distribute_natural_allocation (gint              extra_space,
+int
+gtk_distribute_natural_allocation (int               extra_space,
                                   guint             n_requested_sizes,
                                   GtkRequestedSize *sizes)
 {
   guint *spreading;
-  gint   i;
+  int    i;
 
   g_return_val_if_fail (extra_space >= 0, 0);
 
@@ -735,11 +735,11 @@ gtk_distribute_natural_allocation (gint              extra_space,
        * Sort order and reducing remaining space by assigned space
        * ensures that space is distributed equally.
        */
-      gint glue = (extra_space + i) / (i + 1);
-      gint gap = sizes[(spreading[i])].natural_size
+      int glue = (extra_space + i) / (i + 1);
+      int gap = sizes[(spreading[i])].natural_size
        - sizes[(spreading[i])].minimum_size;
 
-      gint extra = MIN (glue, gap);
+      int extra = MIN (glue, gap);
 
       sizes[spreading[i]].minimum_size += extra;
 
index 155fc5d13e71b272de59dec3b3f4c51c0584e02b..4f3b03d79997c7582d1f650b6d1b67ee793ed3fa 100644 (file)
@@ -41,14 +41,14 @@ typedef struct _GtkRequestedSize         GtkRequestedSize;
 struct _GtkRequestedSize
 {
   gpointer data;
-  gint     minimum_size;
-  gint     natural_size;
+  int      minimum_size;
+  int      natural_size;
 };
 
 
 /* General convenience function to aid in allocating natural sizes */
 GDK_AVAILABLE_IN_ALL
-gint                gtk_distribute_natural_allocation               (gint              extra_space,
+int                 gtk_distribute_natural_allocation               (int               extra_space,
                                                                      guint             n_requested_sizes,
                                                                      GtkRequestedSize *sizes);
 
index a68e29903fd0aee2c9c57999e1853e6198e6a47f..5631a6457a3d00f157c502d16406396bc3d227b5 100644 (file)
@@ -34,7 +34,7 @@ _gtk_size_request_cache_init (SizeRequestCache *cache)
 static void
 free_sizes_x (SizeRequestX **sizes)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < GTK_SIZE_REQUEST_CACHED_SIZES && sizes[i] != NULL; i++)
     g_slice_free (SizeRequestX, sizes[i]);
@@ -45,7 +45,7 @@ free_sizes_x (SizeRequestX **sizes)
 static void
 free_sizes_y (SizeRequestY **sizes)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < GTK_SIZE_REQUEST_CACHED_SIZES && sizes[i] != NULL; i++)
     g_slice_free (SizeRequestY, sizes[i]);
index 62ff2260313f376f7779d35b2d3d3edc6da8bdbe..5d460ed013fe2b932463ea33782574b352c4a3a1 100644 (file)
@@ -39,28 +39,28 @@ G_BEGIN_DECLS
 #define GTK_SIZE_REQUEST_CACHED_SIZES   (5)
 
 typedef struct {
-  gint minimum_size;
-  gint natural_size;
+  int minimum_size;
+  int natural_size;
 } CachedSizeX;
 
 typedef struct {
-  gint minimum_size;
-  gint natural_size;
-  gint minimum_baseline;
-  gint natural_baseline;
+  int minimum_size;
+  int natural_size;
+  int minimum_baseline;
+  int natural_baseline;
 } CachedSizeY;
 
 typedef struct
 {
-  gint       lower_for_size; /* The minimum for_size with the same result */
-  gint       upper_for_size; /* The maximum for_size with the same result */
+  int        lower_for_size; /* The minimum for_size with the same result */
+  int        upper_for_size; /* The maximum for_size with the same result */
   CachedSizeX cached_size;
 } SizeRequestX;
 
 typedef struct
 {
-  gint       lower_for_size; /* The minimum for_size with the same result */
-  gint       upper_for_size; /* The maximum for_size with the same result */
+  int        lower_for_size; /* The minimum for_size with the same result */
+  int        upper_for_size; /* The maximum for_size with the same result */
   CachedSizeY cached_size;
 } SizeRequestY;
 
index c9f93b69dcc666c93aea7d36852431ffb3b93261..78b814469297d4a5eff237e3a341e679a0d94dc4 100644 (file)
@@ -28,7 +28,7 @@ typedef struct _GtkSortKeysClass GtkSortKeysClass;
 struct _GtkSortKeys
 {
   const GtkSortKeysClass *klass;
-  gint ref_count;
+  int ref_count;
 
   gsize key_size;
   gsize key_align; /* must be power of 2 */
index 3da876839c6cd7eadd1676b50cdf723dfc1b12fe..2bada1e6fd7d07c303e00157d36e9fe0afacfd56 100644 (file)
  * // Provides a function to retrieve an integer value from a GtkSpinButton
  * // and creates a spin button to model percentage values.
  *
- * gint
+ * int
  * grab_int_value (GtkSpinButton *button,
  *                 gpointer       user_data)
  * {
@@ -222,9 +222,9 @@ struct _GtkSpinButtonClass
 {
   GtkWidgetClass parent_class;
 
-  gint (*input)  (GtkSpinButton *spin_button,
-                  gdouble       *new_value);
-  gint (*output) (GtkSpinButton *spin_button);
+  int (*input)  (GtkSpinButton *spin_button,
+                 gdouble       *new_value);
+  int (*output) (GtkSpinButton *spin_button);
   void (*value_changed) (GtkSpinButton *spin_button);
 
   /* Action signals for keybindings, do not connect to these */
@@ -289,14 +289,14 @@ static void gtk_spin_button_snap           (GtkSpinButton      *spin_button,
                                             gdouble             val);
 static void gtk_spin_button_insert_text    (GtkEditable        *editable,
                                             const gchar        *new_text,
-                                            gint                new_text_length,
-                                            gint               *position);
+                                            int                 new_text_length,
+                                            int                *position);
 static void gtk_spin_button_real_spin      (GtkSpinButton      *spin_button,
                                             gdouble             step);
 static void gtk_spin_button_real_change_value (GtkSpinButton   *spin,
                                                GtkScrollType    scroll);
 
-static gint gtk_spin_button_default_input  (GtkSpinButton      *spin_button,
+static int gtk_spin_button_default_input   (GtkSpinButton      *spin_button,
                                             gdouble            *new_val);
 static void gtk_spin_button_default_output (GtkSpinButton      *spin_button);
 
@@ -1133,7 +1133,7 @@ gtk_spin_button_set_orientation (GtkSpinButton  *spin,
 
 static gchar *
 weed_out_neg_zero (gchar *str,
-                   gint   digits)
+                   int    digits)
 {
   if (str[0] == '-')
     {
@@ -1199,7 +1199,7 @@ gtk_spin_button_state_flags_changed (GtkWidget     *widget,
   GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->state_flags_changed (widget, previous_state);
 }
 
-static gint
+static int
 gtk_spin_button_timer (GtkSpinButton *spin_button)
 {
   gboolean retval = FALSE;
@@ -1391,8 +1391,8 @@ gtk_spin_button_activate (GtkText *entry,
 static void
 gtk_spin_button_insert_text (GtkEditable *editable,
                              const gchar *new_text,
-                             gint         new_text_length,
-                             gint        *position)
+                             int          new_text_length,
+                             int         *position)
 {
   GtkSpinButton *spin = GTK_SPIN_BUTTON (editable);
 
@@ -1400,11 +1400,11 @@ gtk_spin_button_insert_text (GtkEditable *editable,
     {
       struct lconv *lc;
       gboolean sign;
-      gint dotpos = -1;
-      gint i;
+      int dotpos = -1;
+      int i;
       guint32 pos_sign;
       guint32 neg_sign;
-      gint entry_length;
+      int entry_length;
       const gchar *entry_text;
 
       entry_text = gtk_editable_get_text (GTK_EDITABLE (spin->entry));
@@ -1461,7 +1461,7 @@ gtk_spin_button_insert_text (GtkEditable *editable,
           }
 
       if (dotpos > -1 && *position > dotpos &&
-          (gint)spin->digits - entry_length
+          (int)spin->digits - entry_length
             + dotpos - new_text_length + 1 < 0)
         return;
 
@@ -1476,7 +1476,7 @@ gtk_spin_button_insert_text (GtkEditable *editable,
           else if (new_text[i] == *(lc->decimal_point))
             {
               if (!spin->digits || dotpos > -1 ||
-                  (new_text_length - 1 - i + entry_length - *position > (gint)spin->digits))
+                  (new_text_length - 1 - i + entry_length - *position > (int)spin->digits))
                 return;
               dotpos = *position + i;
             }
@@ -1539,7 +1539,7 @@ gtk_spin_button_real_spin (GtkSpinButton *spin_button,
     g_signal_emit (spin_button, spinbutton_signals[WRAPPED], 0);
 }
 
-static gint
+static int
 gtk_spin_button_default_input (GtkSpinButton *spin_button,
                                gdouble       *new_val)
 {
@@ -1687,7 +1687,7 @@ gtk_spin_button_new_with_range (gdouble min,
 {
   GtkAdjustment *adjustment;
   GtkSpinButton *spin;
-  gint digits;
+  int digits;
 
   g_return_val_if_fail (min <= max, NULL);
   g_return_val_if_fail (step != 0.0, NULL);
@@ -1699,7 +1699,7 @@ gtk_spin_button_new_with_range (gdouble min,
   if (fabs (step) >= 1.0 || step == 0.0)
     digits = 0;
   else {
-    digits = abs ((gint) floor (log10 (fabs (step))));
+    digits = abs ((int) floor (log10 (fabs (step))));
     if (digits > MAX_DIGITS)
       digits = MAX_DIGITS;
   }
@@ -1914,7 +1914,7 @@ gtk_spin_button_get_value (GtkSpinButton *spin_button)
  *
  * Returns: the value of @spin_button
  */
-gint
+int
 gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button)
 {
   gdouble val;
@@ -1945,7 +1945,7 @@ gtk_spin_button_set_value (GtkSpinButton *spin_button,
     gtk_adjustment_set_value (spin_button->adjustment, value);
   else
     {
-      gint return_val = FALSE;
+      int return_val = FALSE;
       g_signal_emit (spin_button, spinbutton_signals[OUTPUT], 0, &return_val);
       if (!return_val)
         gtk_spin_button_default_output (spin_button);
@@ -2209,8 +2209,8 @@ void
 gtk_spin_button_update (GtkSpinButton *spin_button)
 {
   gdouble val;
-  gint error = 0;
-  gint return_val;
+  int error = 0;
+  int return_val;
 
   g_return_if_fail (GTK_IS_SPIN_BUTTON (spin_button));
 
index 405fd6b5e96e932fd1e1df541d88432b0ea85ea2..5e9b70caa5a9dc6a58c59a48e3a5dbf0e94b98b7 100644 (file)
@@ -149,7 +149,7 @@ GDK_AVAILABLE_IN_ALL
 gdouble                gtk_spin_button_get_value          (GtkSpinButton  *spin_button);
 
 GDK_AVAILABLE_IN_ALL
-gint           gtk_spin_button_get_value_as_int   (GtkSpinButton  *spin_button);
+int            gtk_spin_button_get_value_as_int   (GtkSpinButton  *spin_button);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_spin_button_set_value          (GtkSpinButton  *spin_button,
index 8194f67302b4176941c88870d684407638938177..8b5545ed265929189980b5ed456ba850a94ae9d6 100644 (file)
@@ -142,8 +142,8 @@ typedef struct {
   GtkProgressTracker tracker;
   gboolean first_frame_skipped;
 
-  gint last_visible_widget_width;
-  gint last_visible_widget_height;
+  int last_visible_widget_width;
+  int last_visible_widget_height;
 
   gboolean interpolate_size;
 
@@ -886,7 +886,7 @@ get_simple_transition_type (gboolean               new_child_first,
     }
 }
 
-static gint
+static int
 get_bin_window_x (GtkStack *stack)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
@@ -906,7 +906,7 @@ get_bin_window_x (GtkStack *stack)
   return x;
 }
 
-static gint
+static int
 get_bin_window_y (GtkStack *stack)
 {
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
@@ -2038,7 +2038,7 @@ gtk_stack_snapshot_under (GtkWidget   *widget,
   GtkStack *stack = GTK_STACK (widget);
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
   int widget_width, widget_height;
-  gint x, y, width, height, pos_x, pos_y;
+  int x, y, width, height, pos_x, pos_y;
 
 
   x = y = 0;
@@ -2382,7 +2382,7 @@ gtk_stack_measure (GtkWidget      *widget,
   GtkStackPrivate *priv = gtk_stack_get_instance_private (stack);
   GtkStackPage *child_info;
   GtkWidget *child;
-  gint child_min, child_nat;
+  int child_min, child_nat;
   GList *l;
 
   *minimum = 0;
index 0a11c83007265e99b111c42e939a2df76e381432..620411e873488cb62e463cf61abc45512f153826 100644 (file)
@@ -521,7 +521,7 @@ gtk_style_context_get_state (GtkStyleContext *context)
  **/
 void
 gtk_style_context_set_scale (GtkStyleContext *context,
-                             gint             scale)
+                             int              scale)
 {
   GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context);
 
@@ -552,7 +552,7 @@ gtk_style_context_set_scale (GtkStyleContext *context,
  *
  * Returns: the scale
  **/
-gint
+int
 gtk_style_context_get_scale (GtkStyleContext *context)
 {
   GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context);
@@ -988,8 +988,8 @@ draw_insertion_cursor (GtkStyleContext *context,
 {
   GdkRGBA primary_color;
   GdkRGBA secondary_color;
-  gint stem_width;
-  gint offset;
+  int stem_width;
+  int offset;
 
   cairo_save (cr);
   cairo_new_path (cr);
@@ -1010,8 +1010,8 @@ draw_insertion_cursor (GtkStyleContext *context,
 
   if (draw_arrow)
     {
-      gint arrow_width;
-      gint ax, ay;
+      int arrow_width;
+      int ax, ay;
 
       arrow_width = stem_width + 1;
 
@@ -1049,8 +1049,8 @@ get_insertion_cursor_bounds (gdouble          height,
                              gboolean         draw_arrow,
                              graphene_rect_t *bounds)
 {
-  gint stem_width;
-  gint offset;
+  int stem_width;
+  int offset;
 
   stem_width = height * aspect_ratio + 1;
   if (direction == PANGO_DIRECTION_LTR)
index e6e7fcd81df6b63d778e632e4be5b3c6df5df605..87cc285c2fce288f5fa67e0f36de0e0410b9875f 100644 (file)
@@ -861,9 +861,9 @@ GtkStateFlags gtk_style_context_get_state    (GtkStyleContext *context);
 
 GDK_AVAILABLE_IN_ALL
 void          gtk_style_context_set_scale    (GtkStyleContext *context,
-                                              gint             scale);
+                                              int              scale);
 GDK_AVAILABLE_IN_ALL
-gint          gtk_style_context_get_scale    (GtkStyleContext *context);
+int           gtk_style_context_get_scale    (GtkStyleContext *context);
 
 GDK_AVAILABLE_IN_ALL
 void     gtk_style_context_add_class    (GtkStyleContext *context,
index e720ac3030811d4a116f6f791ab18fe040344344..6740d9eeedd8c4a705c11122c184e1b96b73c8b3 100644 (file)
@@ -195,7 +195,7 @@ gtk_switch_begin_toggle_animation (GtkSwitch *self)
 
 static void
 gtk_switch_click_gesture_pressed (GtkGestureClick *gesture,
-                                  gint             n_press,
+                                  int              n_press,
                                   gdouble          x,
                                   gdouble          y,
                                   GtkSwitch       *self)
@@ -215,7 +215,7 @@ gtk_switch_click_gesture_pressed (GtkGestureClick *gesture,
 
 static void
 gtk_switch_click_gesture_released (GtkGestureClick *gesture,
-                                   gint             n_press,
+                                   int              n_press,
                                    gdouble          x,
                                    gdouble          y,
                                    GtkSwitch       *self)
@@ -303,7 +303,7 @@ gtk_switch_measure (GtkWidget      *widget,
                     int            *natural_baseline)
 {
   GtkSwitch *self = GTK_SWITCH (widget);
-  gint slider_minimum, slider_natural;
+  int slider_minimum, slider_natural;
   int on_nat, off_nat;
 
   gtk_widget_measure (self->slider, orientation, -1,
index 4ce0b781bb1359c9cb536a748feb912e3c9df9b5..0fa6db6c5eba994c2bf4f4a284d2bda1bc8bdc33 100644 (file)
@@ -90,7 +90,7 @@ GDK_AVAILABLE_IN_ALL
 void            gtk_text_set_max_length                 (GtkText         *self,
                                                          int              length);
 GDK_AVAILABLE_IN_ALL
-gint            gtk_text_get_max_length                 (GtkText         *self);
+int             gtk_text_get_max_length                 (GtkText         *self);
 GDK_AVAILABLE_IN_ALL
 guint16         gtk_text_get_text_length                (GtkText         *self);
 
index f6332c0dc750a7948bf132c800b86cbb96758363..bb756d44ead6c54e106a337f4a3b4754dcb8cf2c 100644 (file)
@@ -91,7 +91,7 @@ struct _GtkTextAppearance
   GdkRGBA *strikethrough_rgba;
 
   /* super/subscript rise, can be negative */
-  gint rise;
+  int rise;
 
   guint underline : 4;          /* PangoUnderline */
   guint overline  : 2;          /* PangoOverline */
@@ -154,13 +154,13 @@ struct _GtkTextAttributes
 
   gdouble font_scale;
 
-  gint left_margin;
-  gint right_margin;
-  gint indent;
+  int left_margin;
+  int right_margin;
+  int indent;
 
-  gint pixels_above_lines;
-  gint pixels_below_lines;
-  gint pixels_inside_wrap;
+  int pixels_above_lines;
+  int pixels_below_lines;
+  int pixels_inside_wrap;
 
   PangoTabArray *tabs;
 
@@ -174,12 +174,12 @@ struct _GtkTextAttributes
   guint no_fallback: 1;
   guint no_breaks : 1;
   guint show_spaces : 3; /* PangoShowFlags */
-  gint  no_hyphens : 1;
+  int   no_hyphens : 1;
 
 
   GdkRGBA *pg_bg_rgba;
 
-  gint letter_spacing;
+  int letter_spacing;
 
   gchar *font_features;
 };
index 65aae142e1be32cd7dcc4be45e34cecfeef0e20f..37ab1fe77b2d6adfe594ff5ce1a41b2c0de7dbba 100644 (file)
@@ -103,7 +103,7 @@ struct _NodeData {
   NodeData *next;
 
   /* Height and width of this node */
-  gint height;
+  int height;
   signed int width : 24;
 
   /* boolean indicating whether the lines below this node are in need of validation.
@@ -257,11 +257,11 @@ static void              gtk_text_btree_rebalance                (GtkTextBTree
 static GtkTextLine     * get_last_line                           (GtkTextBTree     *tree);
 static void              post_insert_fixup                       (GtkTextBTree     *tree,
                                                                   GtkTextLine      *insert_line,
-                                                                  gint              char_count_delta,
-                                                                  gint              line_count_delta);
+                                                                  int               char_count_delta,
+                                                                  int               line_count_delta);
 static void              gtk_text_btree_node_adjust_toggle_count (GtkTextBTreeNode *node,
                                                                   GtkTextTagInfo   *info,
-                                                                  gint              adjust);
+                                                                  int               adjust);
 static gboolean          gtk_text_btree_node_has_tag             (GtkTextBTreeNode *node,
                                                                   GtkTextTag       *tag);
 
@@ -307,8 +307,8 @@ static NodeData         *    gtk_text_btree_node_ensure_data         (GtkTextBTr
                                                                       gpointer          view_id);
 static void                  gtk_text_btree_node_get_size            (GtkTextBTreeNode *node,
                                                                       gpointer          view_id,
-                                                                      gint             *width,
-                                                                      gint             *height);
+                                                                      int              *width,
+                                                                      int              *height);
 static GtkTextBTreeNode *    gtk_text_btree_node_common_parent       (GtkTextBTreeNode *node1,
                                                                       GtkTextBTreeNode *node2);
 static void get_tree_bounds       (GtkTextBTree     *tree,
@@ -743,7 +743,7 @@ _gtk_text_btree_delete (GtkTextIter *start,
   GtkTextLine *end_line;
   GtkTextLine *line;
   GtkTextLine *deleted_lines = NULL;        /* List of lines we've deleted */
-  gint start_byte_offset;
+  int start_byte_offset;
 
   g_return_if_fail (start != NULL);
   g_return_if_fail (end != NULL);
@@ -808,7 +808,7 @@ _gtk_text_btree_delete (GtkTextIter *start,
   curnode = curline->parent;
   while (seg != last_seg)
     {
-      gint char_count = 0;
+      int char_count = 0;
 
       if (seg == NULL)
         {
@@ -997,8 +997,8 @@ _gtk_text_btree_delete (GtkTextIter *start,
         {
           GtkTextLineData *ld;
 
-          gint deleted_width = 0;
-          gint deleted_height = 0;
+          int deleted_width = 0;
+          int deleted_height = 0;
 
           line = deleted_lines;
           while (line)
@@ -1093,7 +1093,7 @@ _gtk_text_btree_delete (GtkTextIter *start,
 void
 _gtk_text_btree_insert (GtkTextIter *iter,
                         const gchar *text,
-                        gint         len)
+                        int          len)
 {
   GtkTextLineSegment *prev_seg;     /* The segment just before the first
                                      * new segment (NULL means new segment
@@ -1107,18 +1107,18 @@ _gtk_text_btree_insert (GtkTextIter *iter,
   GtkTextLineSegment *seg;
   GtkTextLine *newline;
   int chunk_len;                        /* # characters in current chunk. */
-  gint sol;                           /* start of line */
-  gint eol;                           /* Pointer to character just after last
+  int sol;                           /* start of line */
+  int eol;                           /* Pointer to character just after last
                                        * one in current chunk.
                                        */
-  gint delim;                          /* index of paragraph delimiter */
+  int delim;                          /* index of paragraph delimiter */
   int line_count_delta;                /* Counts change to total number of
                                         * lines in file.
                                         */
 
   int char_count_delta;                /* change to number of chars */
   GtkTextBTree *tree;
-  gint start_byte_index;
+  int start_byte_index;
   GtkTextLine *start_line;
 
   g_return_if_fail (text != NULL);
@@ -1266,7 +1266,7 @@ insert_paintable_or_widget_segment (GtkTextIter        *iter,
   GtkTextLineSegment *prevPtr;
   GtkTextLine *line;
   GtkTextBTree *tree;
-  gint start_byte_offset;
+  int start_byte_offset;
 
   line = _gtk_text_iter_get_text_line (iter);
   tree = _gtk_text_iter_get_btree (iter);
@@ -1358,10 +1358,10 @@ _gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor)
 
 static GtkTextLine*
 find_line_by_y (GtkTextBTree *tree, BTreeView *view,
-                GtkTextBTreeNode *node, gint y, gint *line_top,
+                GtkTextBTreeNode *node, int y, int *line_top,
                 GtkTextLine *last_line)
 {
-  gint current_y = 0;
+  int current_y = 0;
 
 #ifdef G_ENABLE_DEBUG
   if (GTK_DEBUG_CHECK (TEXT))
@@ -1401,8 +1401,8 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
 
       while (child != NULL)
         {
-          gint width;
-          gint height;
+          int width;
+          int height;
 
           gtk_text_btree_node_get_size (child, view->view_id,
                                         &width, &height);
@@ -1425,13 +1425,13 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
 GtkTextLine *
 _gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
                                 gpointer      view_id,
-                                gint          ypixel,
-                                gint         *line_top_out)
+                                int           ypixel,
+                                int          *line_top_out)
 {
   GtkTextLine *line;
   BTreeView *view;
   GtkTextLine *last_line;
-  gint line_top = 0;
+  int line_top = 0;
 
   view = gtk_text_btree_get_view (tree, view_id);
   g_return_val_if_fail (view != NULL, NULL);
@@ -1447,12 +1447,12 @@ _gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
   return line;
 }
 
-static gint
+static int
 find_line_top_in_line_list (GtkTextBTree *tree,
                             BTreeView *view,
                             GtkTextLine *line,
                             GtkTextLine *target_line,
-                            gint y)
+                            int y)
 {
   while (line != NULL)
     {
@@ -1474,12 +1474,12 @@ find_line_top_in_line_list (GtkTextBTree *tree,
   return 0;
 }
 
-gint
+int
 _gtk_text_btree_find_line_top (GtkTextBTree *tree,
                               GtkTextLine *target_line,
                               gpointer view_id)
 {
-  gint y = 0;
+  int y = 0;
   BTreeView *view;
   GSList *nodes;
   GSList *iter;
@@ -1521,8 +1521,8 @@ _gtk_text_btree_find_line_top (GtkTextBTree *tree,
 
           while (child != NULL)
             {
-              gint width;
-              gint height;
+              int width;
+              int height;
 
               if (child == target_node)
                 break;
@@ -1657,8 +1657,8 @@ _gtk_text_btree_invalidate_region (GtkTextBTree      *tree,
 void
 _gtk_text_btree_get_view_size (GtkTextBTree *tree,
                               gpointer view_id,
-                              gint *width,
-                              gint *height)
+                              int *width,
+                              int *height)
 {
   g_return_if_fail (tree != NULL);
   g_return_if_fail (view_id != NULL);
@@ -2030,8 +2030,8 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig,
 
 static GtkTextLine*
 get_line_internal (GtkTextBTree *tree,
-                   gint          line_number,
-                   gint         *real_line_number,
+                   int           line_number,
+                   int          *real_line_number,
                    gboolean      include_last)
 {
   GtkTextBTreeNode *node;
@@ -2108,25 +2108,25 @@ _gtk_text_btree_get_end_iter_line (GtkTextBTree *tree)
 
 GtkTextLine*
 _gtk_text_btree_get_line (GtkTextBTree *tree,
-                          gint          line_number,
-                          gint         *real_line_number)
+                          int           line_number,
+                          int          *real_line_number)
 {
   return get_line_internal (tree, line_number, real_line_number, TRUE);
 }
 
 GtkTextLine*
 _gtk_text_btree_get_line_no_last (GtkTextBTree      *tree,
-                                  gint               line_number,
-                                  gint              *real_line_number)
+                                  int                line_number,
+                                  int               *real_line_number)
 {
   return get_line_internal (tree, line_number, real_line_number, FALSE);
 }
 
 GtkTextLine*
 _gtk_text_btree_get_line_at_char (GtkTextBTree      *tree,
-                                  gint               char_index,
-                                  gint              *line_start_index,
-                                  gint              *real_char_index)
+                                  int                char_index,
+                                  int               *line_start_index,
+                                  int               *real_char_index)
 {
   GtkTextBTreeNode *node;
   GtkTextLine *line;
@@ -2211,7 +2211,7 @@ _gtk_text_btree_get_line_at_char (GtkTextBTree      *tree,
  * _gtk_text_attributes_fill_from_tags() */
 GtkTextTag**
 _gtk_text_btree_get_tags (const GtkTextIter *iter,
-                         gint *num_tags)
+                         int *num_tags)
 {
   GtkTextBTreeNode *node;
   GtkTextLine *siblingline;
@@ -2219,7 +2219,7 @@ _gtk_text_btree_get_tags (const GtkTextIter *iter,
   int src, dst, index;
   TagInfo tagInfo;
   GtkTextLine *line;
-  gint byte_index;
+  int byte_index;
 
 #define NUM_TAG_INFOS 10
 
@@ -2343,8 +2343,8 @@ copy_segment (GString *string,
   if (seg->type == &gtk_text_char_type)
     {
       gboolean copy = TRUE;
-      gint copy_bytes = 0;
-      gint copy_start = 0;
+      int copy_bytes = 0;
+      int copy_start = 0;
 
       /* Don't copy if we're invisible; segments are invisible/not
          as a whole, no need to check each char */
@@ -2360,7 +2360,7 @@ copy_segment (GString *string,
       if (seg == end_seg)
         {
           /* End is in the same segment; need to copy fewer bytes. */
-          gint end_byte = _gtk_text_iter_get_segment_byte (end);
+          int end_byte = _gtk_text_iter_get_segment_byte (end);
 
           copy_bytes = end_byte - copy_start;
         }
@@ -2452,7 +2452,7 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig,
   return str;
 }
 
-gint
+int
 _gtk_text_btree_line_count (GtkTextBTree *tree)
 {
   /* Subtract bogus line at the end; we return a count
@@ -2460,7 +2460,7 @@ _gtk_text_btree_line_count (GtkTextBTree *tree)
   return tree->root_node->num_lines - 1;
 }
 
-gint
+int
 _gtk_text_btree_char_count (GtkTextBTree *tree)
 {
   /* Exclude newline in bogus last line and the
@@ -2487,7 +2487,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
   int i, index;
   GtkTextLine *line;
   GtkTextBTree *tree;
-  gint byte_index;
+  int byte_index;
 
   line = _gtk_text_iter_get_text_line (iter);
   tree = _gtk_text_iter_get_btree (iter);
@@ -2646,7 +2646,7 @@ redisplay_region (GtkTextBTree      *tree,
   view = tree->views;
   while (view != NULL)
     {
-      gint start_y, end_y;
+      int start_y, end_y;
       GtkTextLineData *ld;
 
       start_y = _gtk_text_btree_find_line_top (tree, start_line, view->view_id);
@@ -3183,7 +3183,7 @@ _gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
  * Lines
  */
 
-gint
+int
 _gtk_text_line_get_number (GtkTextLine *line)
 {
   GtkTextLine *line2;
@@ -3231,7 +3231,7 @@ _gtk_text_line_get_number (GtkTextLine *line)
 
 static GtkTextLineSegment*
 find_toggle_segment_before_char (GtkTextLine *line,
-                                 gint char_in_line,
+                                 int char_in_line,
                                  GtkTextTag *tag)
 {
   GtkTextLineSegment *seg;
@@ -3257,7 +3257,7 @@ find_toggle_segment_before_char (GtkTextLine *line,
 
 static GtkTextLineSegment*
 find_toggle_segment_before_byte (GtkTextLine *line,
-                                 gint byte_in_line,
+                                 int byte_in_line,
                                  GtkTextTag *tag)
 {
   GtkTextLineSegment *seg;
@@ -3371,7 +3371,7 @@ find_toggle_outside_current_line (GtkTextLine *line,
 gboolean
 _gtk_text_line_char_has_tag (GtkTextLine *line,
                              GtkTextBTree *tree,
-                             gint char_in_line,
+                             int char_in_line,
                              GtkTextTag *tag)
 {
   GtkTextLineSegment *toggle_seg;
@@ -3395,7 +3395,7 @@ _gtk_text_line_char_has_tag (GtkTextLine *line,
 gboolean
 _gtk_text_line_byte_has_tag (GtkTextLine *line,
                              GtkTextBTree *tree,
-                             gint byte_in_line,
+                             int byte_in_line,
                              GtkTextTag *tag)
 {
   GtkTextLineSegment *toggle_seg;
@@ -3428,7 +3428,7 @@ ensure_end_iter_line (GtkTextBTree *tree)
 {
   if (tree->end_iter_line_stamp != tree->chars_changed_stamp)
     {
-      gint real_line;
+      int real_line;
        
        /* n_lines is without the magic line at the end */
       g_assert (_gtk_text_btree_line_count (tree) >= 1);
@@ -3724,11 +3724,11 @@ _gtk_text_line_invalidate_wrap (GtkTextLine *line,
   gtk_text_btree_node_invalidate_upward (line->parent, ld->view_id);
 }
 
-gint
+int
 _gtk_text_line_char_count (GtkTextLine *line)
 {
   GtkTextLineSegment *seg;
-  gint size;
+  int size;
 
   size = 0;
   seg = line->segments;
@@ -3740,11 +3740,11 @@ _gtk_text_line_char_count (GtkTextLine *line)
   return size;
 }
 
-gint
+int
 _gtk_text_line_byte_count (GtkTextLine *line)
 {
   GtkTextLineSegment *seg;
-  gint size;
+  int size;
 
   size = 0;
   seg = line->segments;
@@ -3757,13 +3757,13 @@ _gtk_text_line_byte_count (GtkTextLine *line)
   return size;
 }
 
-gint
+int
 _gtk_text_line_char_index (GtkTextLine *target_line)
 {
   GSList *node_stack = NULL;
   GtkTextBTreeNode *iter;
   GtkTextLine *line;
-  gint num_chars;
+  int num_chars;
 
   /* Push all our parent nodes onto a stack */
   iter = target_line->parent;
@@ -3844,8 +3844,8 @@ _gtk_text_line_char_index (GtkTextLine *target_line)
 
 GtkTextLineSegment*
 _gtk_text_line_byte_to_segment (GtkTextLine *line,
-                               gint byte_offset,
-                               gint *seg_offset)
+                               int byte_offset,
+                               int *seg_offset)
 {
   GtkTextLineSegment *seg;
   int offset;
@@ -3870,8 +3870,8 @@ _gtk_text_line_byte_to_segment (GtkTextLine *line,
 
 GtkTextLineSegment*
 _gtk_text_line_char_to_segment (GtkTextLine *line,
-                               gint char_offset,
-                               gint *seg_offset)
+                               int char_offset,
+                               int *seg_offset)
 {
   GtkTextLineSegment *seg;
   int offset;
@@ -3896,8 +3896,8 @@ _gtk_text_line_char_to_segment (GtkTextLine *line,
 
 GtkTextLineSegment*
 _gtk_text_line_byte_to_any_segment (GtkTextLine *line,
-                                   gint byte_offset,
-                                   gint *seg_offset)
+                                   int byte_offset,
+                                   int *seg_offset)
 {
   GtkTextLineSegment *seg;
   int offset;
@@ -3922,8 +3922,8 @@ _gtk_text_line_byte_to_any_segment (GtkTextLine *line,
 
 GtkTextLineSegment*
 _gtk_text_line_char_to_any_segment (GtkTextLine *line,
-                                   gint char_offset,
-                                   gint *seg_offset)
+                                   int char_offset,
+                                   int *seg_offset)
 {
   GtkTextLineSegment *seg;
   int offset;
@@ -3946,11 +3946,11 @@ _gtk_text_line_char_to_any_segment (GtkTextLine *line,
   return seg;
 }
 
-gint
+int
 _gtk_text_line_byte_to_char (GtkTextLine *line,
-                            gint byte_offset)
+                            int byte_offset)
 {
-  gint char_offset;
+  int char_offset;
   GtkTextLineSegment *seg;
 
   g_return_val_if_fail (line != NULL, 0);
@@ -3988,9 +3988,9 @@ _gtk_text_line_byte_to_char (GtkTextLine *line,
     }
 }
 
-gint
+int
 _gtk_text_line_char_to_byte (GtkTextLine *line,
-                            gint         char_offset)
+                            int          char_offset)
 {
   g_warning ("FIXME not implemented");
 
@@ -4001,17 +4001,17 @@ _gtk_text_line_char_to_byte (GtkTextLine *line,
    way to merge the two functions) */
 gboolean
 _gtk_text_line_byte_locate (GtkTextLine *line,
-                            gint byte_offset,
+                            int byte_offset,
                             GtkTextLineSegment **segment,
                             GtkTextLineSegment **any_segment,
-                            gint *seg_byte_offset,
-                            gint *line_byte_offset)
+                            int *seg_byte_offset,
+                            int *line_byte_offset)
 {
   GtkTextLineSegment *seg;
   GtkTextLineSegment *after_last_indexable;
   GtkTextLineSegment *last_indexable;
-  gint offset;
-  gint bytes_in_line;
+  int offset;
+  int bytes_in_line;
 
   g_return_val_if_fail (line != NULL, FALSE);
   g_return_val_if_fail (byte_offset >= 0, FALSE);
@@ -4078,17 +4078,17 @@ _gtk_text_line_byte_locate (GtkTextLine *line,
    way to merge the two functions) */
 gboolean
 _gtk_text_line_char_locate     (GtkTextLine     *line,
-                                gint              char_offset,
+                                int               char_offset,
                                 GtkTextLineSegment **segment,
                                 GtkTextLineSegment **any_segment,
-                                gint             *seg_char_offset,
-                                gint             *line_char_offset)
+                                int              *seg_char_offset,
+                                int              *line_char_offset)
 {
   GtkTextLineSegment *seg;
   GtkTextLineSegment *after_last_indexable;
   GtkTextLineSegment *last_indexable;
-  gint offset;
-  gint chars_in_line;
+  int offset;
+  int chars_in_line;
 
   g_return_val_if_fail (line != NULL, FALSE);
   g_return_val_if_fail (char_offset >= 0, FALSE);
@@ -4153,9 +4153,9 @@ _gtk_text_line_char_locate     (GtkTextLine     *line,
 
 void
 _gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
-                                    gint byte_offset,
-                                    gint *line_char_offset,
-                                    gint *seg_char_offset)
+                                    int byte_offset,
+                                    int *line_char_offset,
+                                    int *seg_char_offset)
 {
   GtkTextLineSegment *seg;
   int offset;
@@ -4199,9 +4199,9 @@ _gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
 
 void
 _gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
-                                    gint char_offset,
-                                    gint *line_byte_offset,
-                                    gint *seg_byte_offset)
+                                    int char_offset,
+                                    int *line_byte_offset,
+                                    int *seg_byte_offset)
 {
   GtkTextLineSegment *seg;
   int offset;
@@ -4251,7 +4251,7 @@ _gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
     }
 }
 
-static gint
+static int
 node_compare (GtkTextBTreeNode *lhs,
               GtkTextBTreeNode *rhs)
 {
@@ -4433,7 +4433,7 @@ _gtk_text_line_next_could_contain_tag (GtkTextLine  *line,
     }
   else
     {
-      gint ordering;
+      int ordering;
 
       ordering = node_compare (line->parent, info->tag_root);
 
@@ -4630,7 +4630,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine  *line,
     }
   else
     {
-      gint ordering;
+      int ordering;
 
       ordering = node_compare (line->parent, info->tag_root);
 
@@ -4728,9 +4728,9 @@ get_last_line (GtkTextBTree *tree)
 {
   if (tree->last_line_stamp != tree->chars_changed_stamp)
     {
-      gint n_lines;
+      int n_lines;
       GtkTextLine *line;
-      gint real_line;
+      int real_line;
 
       n_lines = _gtk_text_btree_line_count (tree);
 
@@ -4906,7 +4906,7 @@ gtk_text_btree_node_new (void)
 static void
 gtk_text_btree_node_adjust_toggle_count (GtkTextBTreeNode  *node,
                                          GtkTextTagInfo  *info,
-                                         gint adjust)
+                                         int adjust)
 {
   Summary *summary;
 
@@ -5074,11 +5074,11 @@ typedef struct _ValidateState ValidateState;
 
 struct _ValidateState
 {
-  gint remaining_pixels;
+  int remaining_pixels;
   gboolean in_validation;
-  gint y;
-  gint old_height;
-  gint new_height;
+  int y;
+  int old_height;
+  int new_height;
 };
 
 static void
@@ -5087,9 +5087,9 @@ gtk_text_btree_node_validate (BTreeView         *view,
                               gpointer           view_id,
                               ValidateState     *state)
 {
-  gint node_valid = TRUE;
-  gint node_width = 0;
-  gint node_height = 0;
+  int node_valid = TRUE;
+  int node_width = 0;
+  int node_height = 0;
 
   NodeData *nd = gtk_text_btree_node_ensure_data (node, view_id);
   g_return_if_fail (!nd->valid);
@@ -5264,10 +5264,10 @@ gtk_text_btree_node_validate (BTreeView         *view,
 gboolean
 _gtk_text_btree_validate (GtkTextBTree *tree,
                          gpointer      view_id,
-                         gint          max_pixels,
-                         gint         *y,
-                         gint         *old_height,
-                         gint         *new_height)
+                         int           max_pixels,
+                         int          *y,
+                         int          *old_height,
+                         int          *new_height)
 {
   BTreeView *view;
 
@@ -5311,12 +5311,12 @@ _gtk_text_btree_validate (GtkTextBTree *tree,
 static void
 gtk_text_btree_node_compute_view_aggregates (GtkTextBTreeNode *node,
                                              gpointer          view_id,
-                                             gint             *width_out,
-                                             gint             *height_out,
+                                             int              *width_out,
+                                             int              *height_out,
                                              gboolean         *valid_out)
 {
-  gint width = 0;
-  gint height = 0;
+  int width = 0;
+  int height = 0;
   gboolean valid = TRUE;
 
   if (node->level == 0)
@@ -5375,8 +5375,8 @@ gtk_text_btree_node_check_valid (GtkTextBTreeNode *node,
 {
   NodeData *nd = gtk_text_btree_node_ensure_data (node, view_id);
   gboolean valid;
-  gint width;
-  gint height;
+  int width;
+  int height;
 
   gtk_text_btree_node_compute_view_aggregates (node, view_id,
                                                &width, &height, &valid);
@@ -5612,7 +5612,7 @@ gtk_text_btree_node_remove_data (GtkTextBTreeNode *node, gpointer view_id)
 
 static void
 gtk_text_btree_node_get_size (GtkTextBTreeNode *node, gpointer view_id,
-                              gint *width, gint *height)
+                              int *width, int *height)
 {
   NodeData *nd;
 
@@ -5984,8 +5984,8 @@ gtk_text_btree_rebalance (GtkTextBTree *tree,
 static void
 post_insert_fixup (GtkTextBTree *tree,
                    GtkTextLine *line,
-                   gint line_count_delta,
-                   gint char_count_delta)
+                   int line_count_delta,
+                   int char_count_delta)
 
 {
   GtkTextBTreeNode *node;
@@ -6291,7 +6291,7 @@ recompute_node_counts (GtkTextBTree *tree, GtkTextBTreeNode *node)
 void
 _gtk_change_node_toggle_count (GtkTextBTreeNode *node,
                                GtkTextTagInfo   *info,
-                               gint              delta) /* may be negative */
+                               int               delta) /* may be negative */
 {
   Summary *summary, *prevPtr;
   GtkTextBTreeNode *node2Ptr;
@@ -6668,8 +6668,8 @@ gtk_text_btree_node_view_check_consistency (GtkTextBTree     *tree,
                                             GtkTextBTreeNode *node,
                                             NodeData         *nd)
 {
-  gint width;
-  gint height;
+  int width;
+  int height;
   gboolean valid;
   BTreeView *view;
   
index d333216b69b1c6c31f59302a2cb8fadb4c9a30e0..d144637d319c054dc5cb619ce5d1bce1f40f7ce8 100644 (file)
@@ -67,7 +67,7 @@ void _gtk_text_btree_delete           (GtkTextIter  *start,
                                        GtkTextIter  *end);
 void _gtk_text_btree_insert           (GtkTextIter  *iter,
                                        const gchar  *text,
-                                       gint          len);
+                                       int           len);
 void _gtk_text_btree_insert_paintable (GtkTextIter  *iter,
                                        GdkPaintable *texture);
 
@@ -79,9 +79,9 @@ void _gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor);
 /* View stuff */
 GtkTextLine *_gtk_text_btree_find_line_by_y    (GtkTextBTree      *tree,
                                                 gpointer           view_id,
-                                                gint               ypixel,
-                                                gint              *line_top_y);
-gint         _gtk_text_btree_find_line_top     (GtkTextBTree      *tree,
+                                                int                ypixel,
+                                                int               *line_top_y);
+int          _gtk_text_btree_find_line_top     (GtkTextBTree      *tree,
                                                 GtkTextLine       *line,
                                                 gpointer           view_id);
 void         _gtk_text_btree_add_view          (GtkTextBTree      *tree,
@@ -94,16 +94,16 @@ void         _gtk_text_btree_invalidate_region (GtkTextBTree      *tree,
                                                 gboolean           cursors_only);
 void         _gtk_text_btree_get_view_size     (GtkTextBTree      *tree,
                                                 gpointer           view_id,
-                                                gint              *width,
-                                                gint              *height);
+                                                int               *width,
+                                                int               *height);
 gboolean     _gtk_text_btree_is_valid          (GtkTextBTree      *tree,
                                                 gpointer           view_id);
 gboolean     _gtk_text_btree_validate          (GtkTextBTree      *tree,
                                                 gpointer           view_id,
-                                                gint               max_pixels,
-                                                gint              *y,
-                                                gint              *old_height,
-                                                gint              *new_height);
+                                                int                max_pixels,
+                                                int               *y,
+                                                int               *old_height,
+                                                int               *new_height);
 void         _gtk_text_btree_validate_line     (GtkTextBTree      *tree,
                                                 GtkTextLine       *line,
                                                 gpointer           view_id);
@@ -118,24 +118,24 @@ void _gtk_text_btree_tag (const GtkTextIter *start,
 /* "Getters" */
 
 GtkTextLine * _gtk_text_btree_get_line          (GtkTextBTree      *tree,
-                                                 gint               line_number,
-                                                 gint              *real_line_number);
+                                                 int                line_number,
+                                                 int               *real_line_number);
 GtkTextLine * _gtk_text_btree_get_line_no_last  (GtkTextBTree      *tree,
-                                                 gint               line_number,
-                                                 gint              *real_line_number);
+                                                 int                line_number,
+                                                 int               *real_line_number);
 GtkTextLine * _gtk_text_btree_get_end_iter_line (GtkTextBTree      *tree);
 GtkTextLine * _gtk_text_btree_get_line_at_char  (GtkTextBTree      *tree,
-                                                 gint               char_index,
-                                                 gint              *line_start_index,
-                                                 gint              *real_char_index);
+                                                 int                char_index,
+                                                 int               *line_start_index,
+                                                 int               *real_char_index);
 GtkTextTag**  _gtk_text_btree_get_tags          (const GtkTextIter *iter,
-                                                 gint              *num_tags);
+                                                 int               *num_tags);
 gchar        *_gtk_text_btree_get_text          (const GtkTextIter *start,
                                                  const GtkTextIter *end,
                                                  gboolean           include_hidden,
                                                  gboolean           include_nonchars);
-gint          _gtk_text_btree_line_count        (GtkTextBTree      *tree);
-gint          _gtk_text_btree_char_count        (GtkTextBTree      *tree);
+int           _gtk_text_btree_line_count        (GtkTextBTree      *tree);
+int           _gtk_text_btree_char_count        (GtkTextBTree      *tree);
 gboolean      _gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
 
 
@@ -143,15 +143,15 @@ gboolean      _gtk_text_btree_char_is_invisible (const GtkTextIter *iter);
 /* Get iterators (these are implemented in gtktextiter.c) */
 void     _gtk_text_btree_get_iter_at_char         (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
-                                                   gint                char_index);
+                                                   int                 char_index);
 void     _gtk_text_btree_get_iter_at_line_char    (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
-                                                   gint                line_number,
-                                                   gint                char_index);
+                                                   int                 line_number,
+                                                   int                 char_index);
 void     _gtk_text_btree_get_iter_at_line_byte    (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
-                                                   gint                line_number,
-                                                   gint                byte_index);
+                                                   int                 line_number,
+                                                   int                 byte_index);
 gboolean _gtk_text_btree_get_iter_from_string     (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
                                                    const gchar        *string);
@@ -169,7 +169,7 @@ void     _gtk_text_btree_get_end_iter             (GtkTextBTree       *tree,
 void     _gtk_text_btree_get_iter_at_line         (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
                                                    GtkTextLine        *line,
-                                                   gint                byte_offset);
+                                                   int                 byte_offset);
 gboolean _gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree       *tree,
                                                    GtkTextIter        *iter,
                                                    GtkTextTag         *tag);
@@ -222,9 +222,9 @@ GtkTextLine *       _gtk_text_btree_last_could_contain_tag  (GtkTextBTree
 struct _GtkTextLineData {
   gpointer view_id;
   GtkTextLineData *next;
-  gint height;
-  gint top_ink : 16;
-  gint bottom_ink : 16;
+  int height;
+  int top_ink : 16;
+  int bottom_ink : 16;
   signed int width : 24;
   guint valid : 8;             /* Actually a boolean */
 };
@@ -251,14 +251,14 @@ struct _GtkTextLine {
 };
 
 
-gint                _gtk_text_line_get_number                 (GtkTextLine         *line);
+int                 _gtk_text_line_get_number                 (GtkTextLine         *line);
 gboolean            _gtk_text_line_char_has_tag               (GtkTextLine         *line,
                                                                GtkTextBTree        *tree,
-                                                               gint                 char_in_line,
+                                                               int                  char_in_line,
                                                                GtkTextTag          *tag);
 gboolean            _gtk_text_line_byte_has_tag               (GtkTextLine         *line,
                                                                GtkTextBTree        *tree,
-                                                               gint                 byte_in_line,
+                                                               int                  byte_in_line,
                                                                GtkTextTag          *tag);
 gboolean            _gtk_text_line_is_last                    (GtkTextLine         *line,
                                                                GtkTextBTree        *tree);
@@ -275,45 +275,45 @@ gpointer            _gtk_text_line_get_data                   (GtkTextLine
                                                                gpointer             view_id);
 void                _gtk_text_line_invalidate_wrap            (GtkTextLine         *line,
                                                                GtkTextLineData     *ld);
-gint                _gtk_text_line_char_count                 (GtkTextLine         *line);
-gint                _gtk_text_line_byte_count                 (GtkTextLine         *line);
-gint                _gtk_text_line_char_index                 (GtkTextLine         *line);
+int                 _gtk_text_line_char_count                 (GtkTextLine         *line);
+int                 _gtk_text_line_byte_count                 (GtkTextLine         *line);
+int                 _gtk_text_line_char_index                 (GtkTextLine         *line);
 GtkTextLineSegment *_gtk_text_line_byte_to_segment            (GtkTextLine         *line,
-                                                               gint                 byte_offset,
-                                                               gint                *seg_offset);
+                                                               int                  byte_offset,
+                                                               int                 *seg_offset);
 GtkTextLineSegment *_gtk_text_line_char_to_segment            (GtkTextLine         *line,
-                                                               gint                 char_offset,
-                                                               gint                *seg_offset);
+                                                               int                  char_offset,
+                                                               int                 *seg_offset);
 gboolean            _gtk_text_line_byte_locate                (GtkTextLine         *line,
-                                                               gint                 byte_offset,
+                                                               int                  byte_offset,
                                                                GtkTextLineSegment **segment,
                                                                GtkTextLineSegment **any_segment,
-                                                               gint                *seg_byte_offset,
-                                                               gint                *line_byte_offset);
+                                                               int                 *seg_byte_offset,
+                                                               int                 *line_byte_offset);
 gboolean            _gtk_text_line_char_locate                (GtkTextLine         *line,
-                                                               gint                 char_offset,
+                                                               int                  char_offset,
                                                                GtkTextLineSegment **segment,
                                                                GtkTextLineSegment **any_segment,
-                                                               gint                *seg_char_offset,
-                                                               gint                *line_char_offset);
+                                                               int                 *seg_char_offset,
+                                                               int                 *line_char_offset);
 void                _gtk_text_line_byte_to_char_offsets       (GtkTextLine         *line,
-                                                               gint                 byte_offset,
-                                                               gint                *line_char_offset,
-                                                               gint                *seg_char_offset);
+                                                               int                  byte_offset,
+                                                               int                 *line_char_offset,
+                                                               int                 *seg_char_offset);
 void                _gtk_text_line_char_to_byte_offsets       (GtkTextLine         *line,
-                                                               gint                 char_offset,
-                                                               gint                *line_byte_offset,
-                                                               gint                *seg_byte_offset);
+                                                               int                  char_offset,
+                                                               int                 *line_byte_offset,
+                                                               int                 *seg_byte_offset);
 GtkTextLineSegment *_gtk_text_line_byte_to_any_segment        (GtkTextLine         *line,
-                                                               gint                 byte_offset,
-                                                               gint                *seg_offset);
+                                                               int                  byte_offset,
+                                                               int                 *seg_offset);
 GtkTextLineSegment *_gtk_text_line_char_to_any_segment        (GtkTextLine         *line,
-                                                               gint                 char_offset,
-                                                               gint                *seg_offset);
-gint                _gtk_text_line_byte_to_char               (GtkTextLine         *line,
-                                                               gint                 byte_offset);
-gint                _gtk_text_line_char_to_byte               (GtkTextLine         *line,
-                                                               gint                 char_offset);
+                                                               int                  char_offset,
+                                                               int                 *seg_offset);
+int                 _gtk_text_line_byte_to_char               (GtkTextLine         *line,
+                                                               int                  byte_offset);
+int                 _gtk_text_line_char_to_byte               (GtkTextLine         *line,
+                                                               int                  char_offset);
 GtkTextLine    *    _gtk_text_line_next_could_contain_tag     (GtkTextLine         *line,
                                                                GtkTextBTree        *tree,
                                                                GtkTextTag          *tag);
@@ -334,7 +334,7 @@ void _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
                                      GtkTextLine        *line);
 void _gtk_change_node_toggle_count  (GtkTextBTreeNode   *node,
                                      GtkTextTagInfo     *info,
-                                     gint                delta);
+                                     int                 delta);
 
 /* for gtktextmark.c */
 void _gtk_text_btree_release_mark_segment (GtkTextBTree       *tree,
index f50d27903aa5bdb68ade7abba47b5135f1d75627..c4f59efc4ed172477761ef521f869a9ec2bbec86 100644 (file)
@@ -127,7 +127,7 @@ static void gtk_text_buffer_finalize   (GObject            *object);
 static void gtk_text_buffer_real_insert_text           (GtkTextBuffer     *buffer,
                                                         GtkTextIter       *iter,
                                                         const gchar       *text,
-                                                        gint               len);
+                                                        int                len);
 static void gtk_text_buffer_real_insert_paintable      (GtkTextBuffer     *buffer,
                                                         GtkTextIter       *iter,
                                                         GdkPaintable      *paintable);
@@ -1176,7 +1176,7 @@ gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer)
 void
 gtk_text_buffer_set_text (GtkTextBuffer *buffer,
                           const gchar   *text,
-                          gint           len)
+                          int            len)
 {
   GtkTextIter start, end;
 
@@ -1211,7 +1211,7 @@ static void
 gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
                                   GtkTextIter   *iter,
                                   const gchar   *text,
-                                  gint           len)
+                                  int            len)
 {
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
@@ -1231,7 +1231,7 @@ static void
 gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
                              GtkTextIter   *iter,
                              const gchar   *text,
-                             gint           len)
+                             int            len)
 {
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
@@ -1268,7 +1268,7 @@ void
 gtk_text_buffer_insert (GtkTextBuffer *buffer,
                         GtkTextIter   *iter,
                         const gchar   *text,
-                        gint           len)
+                        int            len)
 {
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (iter != NULL);
@@ -1290,7 +1290,7 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer,
 void
 gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
                                   const gchar   *text,
-                                  gint           len)
+                                  int            len)
 {
   GtkTextIter iter;
 
@@ -1326,7 +1326,7 @@ gboolean
 gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
                                     GtkTextIter   *iter,
                                     const gchar   *text,
-                                    gint           len,
+                                    int            len,
                                     gboolean       default_editable)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
@@ -1363,7 +1363,7 @@ gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
 gboolean
 gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
                                               const gchar   *text,
-                                              gint           len,
+                                              int            len,
                                               gboolean       default_editable)
 {
   GtkTextIter iter;
@@ -1616,7 +1616,7 @@ insert_range_not_inside_self (GtkTextBuffer     *buffer,
   
   while (TRUE)
     {
-      gint start_offset;
+      int start_offset;
       GtkTextIter start_iter;
       GSList *tags;
       GSList *tmp_list;
@@ -1821,11 +1821,11 @@ void
 gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
                                   GtkTextIter   *iter,
                                   const gchar   *text,
-                                  gint           len,
+                                  int            len,
                                   GtkTextTag    *first_tag,
                                   ...)
 {
-  gint start_offset;
+  int start_offset;
   GtkTextIter start;
   va_list args;
   GtkTextTag *tag;
@@ -1872,11 +1872,11 @@ void
 gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer *buffer,
                                            GtkTextIter   *iter,
                                            const gchar   *text,
-                                           gint           len,
+                                           int            len,
                                            const gchar   *first_tag_name,
                                            ...)
 {
-  gint start_offset;
+  int start_offset;
   GtkTextIter start;
   va_list args;
   const gchar *tag_name;
@@ -3074,7 +3074,7 @@ gtk_text_buffer_remove_tag_by_name (GtkTextBuffer     *buffer,
   gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
 }
 
-static gint
+static int
 pointer_cmp (gconstpointer a,
              gconstpointer b)
 {
@@ -3220,8 +3220,8 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
 void
 gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
                                          GtkTextIter   *iter,
-                                         gint           line_number,
-                                         gint           char_offset)
+                                         int            line_number,
+                                         int            char_offset)
 {
   GtkTextIter end_line_iter;
 
@@ -3264,8 +3264,8 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
 void
 gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
                                          GtkTextIter   *iter,
-                                         gint           line_number,
-                                         gint           byte_index)
+                                         int            line_number,
+                                         int            byte_index)
 {
   GtkTextIter end_line_iter;
 
@@ -3302,7 +3302,7 @@ gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
 void
 gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer,
                                   GtkTextIter   *iter,
-                                  gint           line_number)
+                                  int            line_number)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -3324,7 +3324,7 @@ gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer,
 void
 gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
                                     GtkTextIter   *iter,
-                                    gint           char_offset)
+                                    int            char_offset)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -3475,7 +3475,7 @@ gtk_text_buffer_get_has_selection (GtkTextBuffer *buffer)
  * 
  * Returns: number of lines in the buffer
  **/
-gint
+int
 gtk_text_buffer_get_line_count (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
@@ -3494,7 +3494,7 @@ gtk_text_buffer_get_line_count (GtkTextBuffer *buffer)
  * 
  * Returns: number of characters in the buffer
  **/
-gint
+int
 gtk_text_buffer_get_char_count (GtkTextBuffer *buffer)
 {
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
@@ -3969,7 +3969,7 @@ gtk_text_buffer_backspace (GtkTextBuffer *buffer,
   GtkTextIter end;
   gboolean retval = FALSE;
   const PangoLogAttr *attrs;
-  gint offset;
+  int offset;
   gboolean backspace_deletes_character;
 
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
@@ -4217,21 +4217,21 @@ gtk_text_buffer_end_user_action (GtkTextBuffer *buffer)
 typedef struct _CacheEntry CacheEntry;
 struct _CacheEntry
 {
-  gint line;
-  gint char_len;
+  int line;
+  int char_len;
   PangoLogAttr *attrs;
 };
 
 struct _GtkTextLogAttrCache
 {
-  gint chars_changed_stamp;
+  int chars_changed_stamp;
   CacheEntry entries[ATTR_CACHE_SIZE];
 };
 
 static void
 free_log_attr_cache (GtkTextLogAttrCache *cache)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < ATTR_CACHE_SIZE; i++)
     g_free (cache->entries[i].attrs);
@@ -4242,7 +4242,7 @@ free_log_attr_cache (GtkTextLogAttrCache *cache)
 static void
 clear_log_attr_cache (GtkTextLogAttrCache *cache)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < ATTR_CACHE_SIZE; i++)
     {
@@ -4253,12 +4253,12 @@ clear_log_attr_cache (GtkTextLogAttrCache *cache)
 
 static PangoLogAttr*
 compute_log_attrs (const GtkTextIter *iter,
-                   gint              *char_lenp)
+                   int               *char_lenp)
 {
   GtkTextIter start;
   GtkTextIter end;
   gchar *paragraph;
-  gint char_len, byte_len;
+  int char_len, byte_len;
   PangoLogAttr *attrs = NULL;
   
   start = *iter;
@@ -4295,12 +4295,12 @@ compute_log_attrs (const GtkTextIter *iter,
 const PangoLogAttr *
 _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
                                      const GtkTextIter *anywhere_in_line,
-                                     gint              *char_len)
+                                     int               *char_len)
 {
   GtkTextBufferPrivate *priv;
-  gint line;
+  int line;
   GtkTextLogAttrCache *cache;
-  gint i;
+  int i;
   
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
   g_return_val_if_fail (anywhere_in_line != NULL, NULL);
@@ -4383,7 +4383,7 @@ _gtk_text_buffer_get_text_before (GtkTextBuffer   *buffer,
                                   GtkTextIter     *start,
                                   GtkTextIter     *end)
 {
-  gint line_number;
+  int line_number;
 
   *start = *position;
   *end = *start;
@@ -4492,7 +4492,7 @@ _gtk_text_buffer_get_text_at (GtkTextBuffer   *buffer,
                               GtkTextIter     *start,
                               GtkTextIter     *end)
 {
-  gint line_number;
+  int line_number;
 
   *start = *position;
   *end = *start;
@@ -4869,7 +4869,7 @@ gtk_text_buffer_insert_with_attributes (GtkTextBuffer *buffer,
   do
     {
       GtkTextTag *tag;
-      gint start, end;
+      int start, end;
 
       pango_attr_iterator_range (attr, &start, &end);
 
@@ -4906,7 +4906,7 @@ void
 gtk_text_buffer_insert_markup (GtkTextBuffer *buffer,
                                GtkTextIter   *iter,
                                const gchar   *markup,
-                               gint           len)
+                               int            len)
 {
   PangoAttrList *attributes;
   gchar *text;
index 3ad3b483e32208f31957418db464946f7d291b05..bd7f272ece53431945064c4511619d5d854d21b5 100644 (file)
@@ -105,7 +105,7 @@ struct _GtkTextBufferClass
   void (* insert_text)            (GtkTextBuffer      *buffer,
                                    GtkTextIter        *pos,
                                    const gchar        *new_text,
-                                   gint                new_text_length);
+                                   int                 new_text_length);
 
   void (* insert_paintable)       (GtkTextBuffer      *buffer,
                                    GtkTextIter        *iter,
@@ -167,9 +167,9 @@ GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkTextBuffer *gtk_text_buffer_new            (GtkTextTagTable *table);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_text_buffer_get_line_count (GtkTextBuffer   *buffer);
+int            gtk_text_buffer_get_line_count (GtkTextBuffer   *buffer);
 GDK_AVAILABLE_IN_ALL
-gint           gtk_text_buffer_get_char_count (GtkTextBuffer   *buffer);
+int            gtk_text_buffer_get_char_count (GtkTextBuffer   *buffer);
 
 
 GDK_AVAILABLE_IN_ALL
@@ -179,29 +179,29 @@ GtkTextTagTable* gtk_text_buffer_get_tag_table (GtkTextBuffer  *buffer);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_set_text          (GtkTextBuffer *buffer,
                                         const gchar   *text,
-                                        gint           len);
+                                        int            len);
 
 /* Insert into the buffer */
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_insert            (GtkTextBuffer *buffer,
                                         GtkTextIter   *iter,
                                         const gchar   *text,
-                                        gint           len);
+                                        int            len);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_insert_at_cursor  (GtkTextBuffer *buffer,
                                         const gchar   *text,
-                                        gint           len);
+                                        int            len);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_insert_interactive           (GtkTextBuffer *buffer,
                                                        GtkTextIter   *iter,
                                                        const gchar   *text,
-                                                       gint           len,
+                                                       int            len,
                                                        gboolean       default_editable);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
                                                        const gchar   *text,
-                                                       gint           len,
+                                                       int            len,
                                                        gboolean       default_editable);
 
 GDK_AVAILABLE_IN_ALL
@@ -220,7 +220,7 @@ GDK_AVAILABLE_IN_ALL
 void    gtk_text_buffer_insert_with_tags          (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const gchar       *text,
-                                                   gint               len,
+                                                   int                len,
                                                    GtkTextTag        *first_tag,
                                                    ...) G_GNUC_NULL_TERMINATED;
 
@@ -228,7 +228,7 @@ GDK_AVAILABLE_IN_ALL
 void    gtk_text_buffer_insert_with_tags_by_name  (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const gchar       *text,
-                                                   gint               len,
+                                                   int                len,
                                                    const gchar       *first_tag_name,
                                                    ...) G_GNUC_NULL_TERMINATED;
 
@@ -236,7 +236,7 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_text_buffer_insert_markup            (GtkTextBuffer     *buffer,
                                                    GtkTextIter       *iter,
                                                    const gchar       *markup,
-                                                   gint               len);
+                                                   int                len);
 
 /* Delete from the buffer */
 GDK_AVAILABLE_IN_ALL
@@ -371,21 +371,21 @@ GtkTextTag    *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
-                                              gint           line_number,
-                                              gint           char_offset);
+                                              int            line_number,
+                                              int            char_offset);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_line_index  (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
-                                              gint           line_number,
-                                              gint           byte_index);
+                                              int            line_number,
+                                              int            byte_index);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_offset      (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
-                                              gint           char_offset);
+                                              int            char_offset);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_iter_at_line        (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter,
-                                              gint           line_number);
+                                              int            line_number);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_buffer_get_start_iter          (GtkTextBuffer *buffer,
                                               GtkTextIter   *iter);
index 8d8363c31a58cdefe97aa18d2ee94f1226c1d14d..8386950344e3f7790785b289a23017b6fd63ab0a 100644 (file)
@@ -29,7 +29,7 @@ GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buff
 
 const PangoLogAttr* _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer     *buffer,
                                                          const GtkTextIter *anywhere_in_line,
-                                                         gint              *char_len);
+                                                         int               *char_len);
 
 void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
                                               GtkTextTag    *tag);
index ce6c4d8d374441d322d4b6567ca7e7f651be75f6..0b67be75531d2c79ccee135bbbb3fd42a3ae807b 100644 (file)
@@ -49,8 +49,8 @@ struct _GtkTextHandle
 
   GdkRectangle pointing_to;
   GtkBorder border;
-  gint dx;
-  gint dy;
+  int dx;
+  int dy;
   guint role : 2;
   guint dragged : 1;
   guint mode_visible : 1;
@@ -366,7 +366,7 @@ handle_drag_update (GtkGestureDrag *gesture,
 {
   GtkTextHandle *handle = GTK_TEXT_HANDLE (widget);
   gdouble start_x, start_y;
-  gint x, y;
+  int x, y;
 
   gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y);
 
index 237030c5f96ff06bcdb57dc4b7c058e762976640..bd87f34bcf0632556b6e4011917cfe85f35a2576 100644 (file)
@@ -59,14 +59,14 @@ struct G_GNUC_MAY_ALIAS _GtkTextRealIter
 
      If the line byte offset is valid, so is the segment byte offset;
      and ditto for char offsets. */
-  gint line_byte_offset;
-  gint line_char_offset;
+  int line_byte_offset;
+  int line_char_offset;
   /* These two are valid if >= 0 */
-  gint cached_char_index;
-  gint cached_line_number;
+  int cached_char_index;
+  int cached_line_number;
   /* Stamps to detect the buffer changing under us */
-  gint chars_changed_stamp;
-  gint segments_changed_stamp;
+  int chars_changed_stamp;
+  int segments_changed_stamp;
   /* Valid if the segments_changed_stamp is up-to-date */
   GtkTextLineSegment *segment;     /* indexable segment we index */
   GtkTextLineSegment *any_segment; /* first segment in our location,
@@ -76,11 +76,11 @@ struct G_GNUC_MAY_ALIAS _GtkTextRealIter
 
      If the line byte offset is valid, so is the segment byte offset;
      and ditto for char offsets. */
-  gint segment_byte_offset;
-  gint segment_char_offset;
+  int segment_byte_offset;
+  int segment_char_offset;
 
   /* padding */
-  gint pad1;
+  int pad1;
   gpointer pad2;
 };
 
@@ -108,7 +108,7 @@ iter_set_common (GtkTextRealIter *iter,
 static void
 iter_set_from_byte_offset (GtkTextRealIter *iter,
                            GtkTextLine *line,
-                           gint byte_offset)
+                           int byte_offset)
 {
   iter_set_common (iter, line);
 
@@ -125,7 +125,7 @@ iter_set_from_byte_offset (GtkTextRealIter *iter,
 static void
 iter_set_from_char_offset (GtkTextRealIter *iter,
                            GtkTextLine *line,
-                           gint char_offset)
+                           int char_offset)
 {
   iter_set_common (iter, line);
 
@@ -145,7 +145,7 @@ iter_set_from_segment (GtkTextRealIter *iter,
                        GtkTextLineSegment *segment)
 {
   GtkTextLineSegment *seg;
-  gint byte_offset;
+  int byte_offset;
 
   /* This could theoretically be optimized by computing all the iter
      fields in this same loop, but I'm skipping it for now. */
@@ -278,7 +278,7 @@ static GtkTextRealIter*
 iter_init_from_byte_offset (GtkTextIter *iter,
                             GtkTextBTree *tree,
                             GtkTextLine *line,
-                            gint line_byte_offset)
+                            int line_byte_offset)
 {
   GtkTextRealIter *real;
 
@@ -302,7 +302,7 @@ static GtkTextRealIter*
 iter_init_from_char_offset (GtkTextIter *iter,
                             GtkTextBTree *tree,
                             GtkTextLine *line,
-                            gint line_char_offset)
+                            int line_char_offset)
 {
   GtkTextRealIter *real;
 
@@ -322,14 +322,14 @@ invalidate_char_index (GtkTextRealIter *iter)
 }
 
 static inline void
-adjust_char_index (GtkTextRealIter *iter, gint count)
+adjust_char_index (GtkTextRealIter *iter, int count)
 {
   if (iter->cached_char_index >= 0)
     iter->cached_char_index += count;
 }
 
 static inline void
-adjust_line_number (GtkTextRealIter *iter, gint count)
+adjust_line_number (GtkTextRealIter *iter, int count)
 {
   if (iter->cached_line_number >= 0)
     iter->cached_line_number += count;
@@ -509,7 +509,7 @@ _gtk_text_iter_get_any_segment (const GtkTextIter *iter)
   return real->any_segment;
 }
 
-gint
+int
 _gtk_text_iter_get_segment_byte (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
@@ -528,7 +528,7 @@ _gtk_text_iter_get_segment_byte (const GtkTextIter *iter)
   return real->segment_byte_offset;
 }
 
-gint
+int
 _gtk_text_iter_get_segment_char (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
@@ -591,7 +591,7 @@ _gtk_text_iter_get_btree (const GtkTextIter *iter)
  *
  * Returns: a character offset
  **/
-gint
+int
 gtk_text_iter_get_offset (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
@@ -629,7 +629,7 @@ gtk_text_iter_get_offset (const GtkTextIter *iter)
  *
  * Returns: a line number
  **/
-gint
+int
 gtk_text_iter_get_line (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
@@ -660,7 +660,7 @@ gtk_text_iter_get_line (const GtkTextIter *iter)
  *
  * Returns: offset from start of line
  **/
-gint
+int
 gtk_text_iter_get_line_offset (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
@@ -691,7 +691,7 @@ gtk_text_iter_get_line_offset (const GtkTextIter *iter)
  *
  * Returns: distance from start of line, in bytes
  **/
-gint
+int
 gtk_text_iter_get_line_index (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
@@ -721,11 +721,11 @@ gtk_text_iter_get_line_index (const GtkTextIter *iter)
  * 
  * Returns: offset in visible characters from the start of the line 
  **/
-gint
+int
 gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
-  gint vis_offset;
+  int vis_offset;
   GtkTextLineSegment *seg;
   GtkTextIter pos;
   
@@ -786,11 +786,11 @@ gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter)
  * 
  * Returns: byte index of @iter with respect to the start of the line
  **/
-gint
+int
 gtk_text_iter_get_visible_line_index (const GtkTextIter *iter)
 {
   GtkTextRealIter *real;
-  gint vis_offset;
+  int vis_offset;
   GtkTextLineSegment *seg;
   GtkTextIter pos;
   
@@ -1345,8 +1345,8 @@ GSList*
 gtk_text_iter_get_tags (const GtkTextIter *iter)
 {
   GtkTextTag** tags;
-  gint tag_count = 0;
-  gint i;
+  int tag_count = 0;
+  int i;
   GSList *retval;
   
   g_return_val_if_fail (iter != NULL, NULL);
@@ -1462,7 +1462,7 @@ gtk_text_iter_get_attributes (const GtkTextIter  *iter,
                               GtkTextAttributes  *values)
 {
   GtkTextTag** tags;
-  gint tag_count = 0;
+  int tag_count = 0;
 
   /* Get the tags at this spot */
   tags = _gtk_text_btree_get_tags (iter, &tag_count);
@@ -1674,11 +1674,11 @@ gtk_text_iter_is_start (const GtkTextIter *iter)
  *
  * Returns: number of characters in the line
  **/
-gint
+int
 gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter)
 {
   GtkTextRealIter *real;
-  gint count;
+  int count;
   GtkTextLineSegment *seg;
 
   g_return_val_if_fail (iter != NULL, 0);
@@ -1726,11 +1726,11 @@ gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter)
  *
  * Returns: number of bytes in the line
  **/
-gint
+int
 gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter)
 {
   GtkTextRealIter *real;
-  gint count;
+  int count;
   GtkTextLineSegment *seg;
 
   g_return_val_if_fail (iter != NULL, 0);
@@ -1896,7 +1896,7 @@ forward_char (GtkTextRealIter *real)
 
       if (real->line_byte_offset >= 0)
         {
-          gint bytes;
+          int bytes;
           const char * start =
             real->segment->body.chars + real->segment_byte_offset;
 
@@ -1936,8 +1936,8 @@ _gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
   GtkTextLineSegment *seg;
   GtkTextLineSegment *any_seg;
   GtkTextRealIter *real;
-  gint chars_skipped;
-  gint bytes_skipped;
+  int chars_skipped;
+  int bytes_skipped;
 
   g_return_val_if_fail (iter != NULL, FALSE);
 
@@ -2070,8 +2070,8 @@ _gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
   GtkTextLineSegment *any_seg;
   GtkTextLineSegment *prev_seg;
   GtkTextLineSegment *prev_any_seg;
-  gint bytes_skipped;
-  gint chars_skipped;
+  int bytes_skipped;
+  int chars_skipped;
 
   g_return_val_if_fail (iter != NULL, FALSE);
 
@@ -2270,7 +2270,7 @@ gtk_text_iter_backward_char (GtkTextIter *iter)
  * Returns: whether @iter moved and is dereferenceable
  **/
 gboolean
-gtk_text_iter_forward_chars (GtkTextIter *iter, gint count)
+gtk_text_iter_forward_chars (GtkTextIter *iter, int count)
 {
   GtkTextRealIter *real;
 
@@ -2301,8 +2301,8 @@ gtk_text_iter_forward_chars (GtkTextIter *iter, gint count)
     }
   else
     {
-      gint current_char_index;
-      gint new_char_index;
+      int current_char_index;
+      int new_char_index;
 
       check_invariants (iter);
 
@@ -2342,7 +2342,7 @@ gtk_text_iter_forward_chars (GtkTextIter *iter, gint count)
  *
  **/
 gboolean
-gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
+gtk_text_iter_backward_chars (GtkTextIter *iter, int count)
 {
   GtkTextRealIter *real;
 
@@ -2375,7 +2375,7 @@ gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
       if (real->line_byte_offset >= 0)
         {
           const char *p;
-          gint new_byte_offset;
+          int new_byte_offset;
 
           /* if in the last fourth of the segment walk backwards */
           if (count < real->segment_char_offset / 4)
@@ -2407,8 +2407,8 @@ gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
        */
       if (TRUE || count > MAX_LINEAR_SCAN)
         {
-          gint current_char_index;
-          gint new_char_index;
+          int current_char_index;
+          int new_char_index;
 
           current_char_index = gtk_text_iter_get_offset (iter);
 
@@ -2455,7 +2455,7 @@ gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
  **/
 gboolean
 gtk_text_iter_forward_text_chars  (GtkTextIter *iter,
-                                   gint         count)
+                                   int          count)
 {
 
 
@@ -2476,7 +2476,7 @@ gtk_text_iter_forward_text_chars  (GtkTextIter *iter,
  **/
 gboolean
 gtk_text_iter_backward_text_chars (GtkTextIter *iter,
-                                   gint         count)
+                                   int          count)
 {
 
 
@@ -2552,7 +2552,7 @@ gtk_text_iter_backward_line (GtkTextIter *iter)
   GtkTextLine *new_line;
   GtkTextRealIter *real;
   gboolean offset_will_change;
-  gint offset;
+  int offset;
 
   g_return_val_if_fail (iter != NULL, FALSE);
 
@@ -2626,7 +2626,7 @@ gtk_text_iter_backward_line (GtkTextIter *iter)
  * Returns: whether @iter moved and is dereferenceable
  **/
 gboolean
-gtk_text_iter_forward_lines (GtkTextIter *iter, gint count)
+gtk_text_iter_forward_lines (GtkTextIter *iter, int count)
 {
   FIX_OVERFLOWS (count);
   
@@ -2641,7 +2641,7 @@ gtk_text_iter_forward_lines (GtkTextIter *iter, gint count)
     }
   else
     {
-      gint old_line;
+      int old_line;
 
       if (gtk_text_iter_is_end (iter))
         return FALSE;
@@ -2677,7 +2677,7 @@ gtk_text_iter_forward_lines (GtkTextIter *iter, gint count)
  * Returns: whether @iter moved and is dereferenceable
  **/
 gboolean
-gtk_text_iter_backward_lines (GtkTextIter *iter, gint count)
+gtk_text_iter_backward_lines (GtkTextIter *iter, int count)
 {
   FIX_OVERFLOWS (count);
   
@@ -2691,7 +2691,7 @@ gtk_text_iter_backward_lines (GtkTextIter *iter, gint count)
     }
   else
     {
-      gint old_line;
+      int old_line;
 
       old_line = gtk_text_iter_get_line (iter);
 
@@ -2791,7 +2791,7 @@ gtk_text_iter_backward_visible_line (GtkTextIter *iter)
  **/
 gboolean
 gtk_text_iter_forward_visible_lines (GtkTextIter *iter,
-                                     gint         count)
+                                     int          count)
 {
   FIX_OVERFLOWS (count);
   
@@ -2829,7 +2829,7 @@ gtk_text_iter_forward_visible_lines (GtkTextIter *iter,
  **/
 gboolean
 gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
-                                      gint         count)
+                                      int          count)
 {
   FIX_OVERFLOWS (count);
   
@@ -2850,23 +2850,23 @@ gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
 }
 
 typedef gboolean (* FindLogAttrFunc) (const PangoLogAttr *attrs,
-                                      gint                offset,
-                                      gint                len,
-                                      gint               *found_offset,
+                                      int                 offset,
+                                      int                 len,
+                                      int                *found_offset,
                                       gboolean            already_moved_initially);
 
 typedef gboolean (* TestLogAttrFunc) (const PangoLogAttr *attrs,
-                                      gint                offset,
-                                      gint                min_offset,
-                                      gint                len);
+                                      int                 offset,
+                                      int                 min_offset,
+                                      int                 len);
 
 /* Word funcs */
 
 static gboolean
 find_word_end_func (const PangoLogAttr *attrs,
-                    gint                offset,
-                    gint                len,
-                    gint               *found_offset,
+                    int                 offset,
+                    int                 len,
+                    int                *found_offset,
                     gboolean            already_moved_initially)
 {
   if (!already_moved_initially)
@@ -2889,18 +2889,18 @@ find_word_end_func (const PangoLogAttr *attrs,
 
 static gboolean
 is_word_end_func (const PangoLogAttr *attrs,
-                  gint                offset,
-                  gint                min_offset,
-                  gint                len)
+                  int                 offset,
+                  int                 min_offset,
+                  int                 len)
 {
   return attrs[offset].is_word_end;
 }
 
 static gboolean
 find_word_start_func (const PangoLogAttr *attrs,
-                      gint                offset,
-                      gint                len,
-                      gint               *found_offset,
+                      int                 offset,
+                      int                 len,
+                      int                *found_offset,
                       gboolean            already_moved_initially)
 {
   if (!already_moved_initially)
@@ -2923,18 +2923,18 @@ find_word_start_func (const PangoLogAttr *attrs,
 
 static gboolean
 is_word_start_func (const PangoLogAttr *attrs,
-                    gint                offset,
-                    gint                min_offset,
-                    gint                len)
+                    int                 offset,
+                    int                 min_offset,
+                    int                 len)
 {
   return attrs[offset].is_word_start;
 }
 
 static gboolean
 inside_word_func (const PangoLogAttr *attrs,
-                  gint                offset,
-                  gint                min_offset,
-                  gint                len)
+                  int                 offset,
+                  int                 min_offset,
+                  int                 len)
 {
   /* Find next word start or end */
   while (offset >= min_offset &&
@@ -2951,9 +2951,9 @@ inside_word_func (const PangoLogAttr *attrs,
 
 static gboolean
 find_sentence_end_func (const PangoLogAttr *attrs,
-                        gint                offset,
-                        gint                len,
-                        gint               *found_offset,
+                        int                 offset,
+                        int                 len,
+                        int                *found_offset,
                         gboolean            already_moved_initially)
 {
   if (!already_moved_initially)
@@ -2976,18 +2976,18 @@ find_sentence_end_func (const PangoLogAttr *attrs,
 
 static gboolean
 is_sentence_end_func (const PangoLogAttr *attrs,
-                      gint                offset,
-                      gint                min_offset,
-                      gint                len)
+                      int                 offset,
+                      int                 min_offset,
+                      int                 len)
 {
   return attrs[offset].is_sentence_end;
 }
 
 static gboolean
 find_sentence_start_func (const PangoLogAttr *attrs,
-                          gint                offset,
-                          gint                len,
-                          gint               *found_offset,
+                          int                 offset,
+                          int                 len,
+                          int                *found_offset,
                           gboolean            already_moved_initially)
 {
   if (!already_moved_initially)
@@ -3010,18 +3010,18 @@ find_sentence_start_func (const PangoLogAttr *attrs,
 
 static gboolean
 is_sentence_start_func (const PangoLogAttr *attrs,
-                        gint                offset,
-                        gint                min_offset,
-                        gint                len)
+                        int                 offset,
+                        int                 min_offset,
+                        int                 len)
 {
   return attrs[offset].is_sentence_start;
 }
 
 static gboolean
 inside_sentence_func (const PangoLogAttr *attrs,
-                      gint                offset,
-                      gint                min_offset,
-                      gint                len)
+                      int                 offset,
+                      int                 min_offset,
+                      int                 len)
 {
   /* Find next sentence start or end */
   while (!(attrs[offset].is_sentence_start || attrs[offset].is_sentence_end))
@@ -3038,9 +3038,9 @@ static gboolean
 test_log_attrs (const GtkTextIter *iter,
                 TestLogAttrFunc    func)
 {
-  gint char_len;
+  int char_len;
   const PangoLogAttr *attrs;
-  gint offset;
+  int offset;
 
   g_return_val_if_fail (iter != NULL, FALSE);
 
@@ -3057,12 +3057,12 @@ test_log_attrs (const GtkTextIter *iter,
 static gboolean
 find_line_log_attrs (const GtkTextIter *iter,
                      FindLogAttrFunc    func,
-                     gint              *found_offset,
+                     int               *found_offset,
                      gboolean           already_moved_initially)
 {
-  gint char_len;
+  int char_len;
   const PangoLogAttr *attrs;
-  gint offset;
+  int offset;
 
   g_return_val_if_fail (iter != NULL, FALSE);
   
@@ -3092,7 +3092,7 @@ find_by_log_attrs (GtkTextIter     *arg_iter,
 
   while (TRUE)
     {
-      gint offset = 0;
+      int offset = 0;
       gboolean found;
 
       found = find_line_log_attrs (&iter, func, &offset, already_moved_initially);
@@ -3170,11 +3170,11 @@ find_visible_by_log_attrs (GtkTextIter     *iter,
 }
 
 typedef gboolean (* OneStepFunc) (GtkTextIter *iter);
-typedef gboolean (* MultipleStepFunc) (GtkTextIter *iter, gint count);
+typedef gboolean (* MultipleStepFunc) (GtkTextIter *iter, int count);
                                  
 static gboolean 
 move_multiple_steps (GtkTextIter *iter, 
-                    gint count,
+                    int count,
                     OneStepFunc step_forward,
                     MultipleStepFunc n_steps_backward)
 {
@@ -3254,7 +3254,7 @@ gtk_text_iter_backward_word_start (GtkTextIter *iter)
  **/
 gboolean
 gtk_text_iter_forward_word_ends (GtkTextIter      *iter,
-                                 gint              count)
+                                 int               count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_forward_word_end,
@@ -3272,7 +3272,7 @@ gtk_text_iter_forward_word_ends (GtkTextIter      *iter,
  **/
 gboolean
 gtk_text_iter_backward_word_starts (GtkTextIter      *iter,
-                                    gint               count)
+                                    int                count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_backward_word_start,
@@ -3326,7 +3326,7 @@ gtk_text_iter_backward_visible_word_start (GtkTextIter      *iter)
  **/
 gboolean
 gtk_text_iter_forward_visible_word_ends (GtkTextIter *iter,
-                                        gint         count)
+                                        int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_forward_visible_word_end,
@@ -3344,7 +3344,7 @@ gtk_text_iter_forward_visible_word_ends (GtkTextIter *iter,
  **/
 gboolean
 gtk_text_iter_backward_visible_word_starts (GtkTextIter *iter,
-                                           gint         count)
+                                           int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_backward_visible_word_start,
@@ -3509,7 +3509,7 @@ gtk_text_iter_backward_sentence_start (GtkTextIter *iter)
  **/
 gboolean
 gtk_text_iter_forward_sentence_ends (GtkTextIter      *iter,
-                                     gint              count)
+                                     int               count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_forward_sentence_end,
@@ -3529,7 +3529,7 @@ gtk_text_iter_forward_sentence_ends (GtkTextIter      *iter,
  **/
 gboolean
 gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
-                                        gint         count)
+                                        int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_backward_sentence_start,
@@ -3538,9 +3538,9 @@ gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
 
 static gboolean
 find_forward_cursor_pos_func (const PangoLogAttr *attrs,
-                              gint                offset,
-                              gint                len,
-                              gint               *found_offset,
+                              int                 offset,
+                              int                 len,
+                              int                *found_offset,
                               gboolean            already_moved_initially)
 {
   if (!already_moved_initially)
@@ -3562,9 +3562,9 @@ find_forward_cursor_pos_func (const PangoLogAttr *attrs,
 
 static gboolean
 find_backward_cursor_pos_func (const PangoLogAttr *attrs,
-                               gint                offset,
-                               gint                len,
-                               gint               *found_offset,
+                               int                 offset,
+                               int                 len,
+                               int                *found_offset,
                                gboolean            already_moved_initially)
 {
   if (!already_moved_initially)
@@ -3586,9 +3586,9 @@ find_backward_cursor_pos_func (const PangoLogAttr *attrs,
 
 static gboolean
 is_cursor_pos_func (const PangoLogAttr *attrs,
-                    gint          offset,
-                    gint          min_offset,
-                    gint          len)
+                    int           offset,
+                    int           min_offset,
+                    int           len)
 {
   return attrs[offset].is_cursor_position;
 }
@@ -3642,7 +3642,7 @@ gtk_text_iter_backward_cursor_position (GtkTextIter *iter)
  **/
 gboolean
 gtk_text_iter_forward_cursor_positions (GtkTextIter *iter,
-                                        gint         count)
+                                        int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_forward_cursor_position,
@@ -3661,7 +3661,7 @@ gtk_text_iter_forward_cursor_positions (GtkTextIter *iter,
  **/
 gboolean
 gtk_text_iter_backward_cursor_positions (GtkTextIter *iter,
-                                         gint         count)
+                                         int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_backward_cursor_position,
@@ -3710,7 +3710,7 @@ gtk_text_iter_backward_visible_cursor_position (GtkTextIter *iter)
  **/
 gboolean
 gtk_text_iter_forward_visible_cursor_positions (GtkTextIter *iter,
-                                               gint         count)
+                                               int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_forward_visible_cursor_position,
@@ -3729,7 +3729,7 @@ gtk_text_iter_forward_visible_cursor_positions (GtkTextIter *iter,
  **/
 gboolean
 gtk_text_iter_backward_visible_cursor_positions (GtkTextIter *iter,
-                                                gint         count)
+                                                int          count)
 {
   return move_multiple_steps (iter, count, 
                              gtk_text_iter_backward_visible_cursor_position,
@@ -3766,10 +3766,10 @@ gtk_text_iter_is_cursor_position (const GtkTextIter *iter)
  **/
 void
 gtk_text_iter_set_line_offset (GtkTextIter *iter,
-                               gint         char_on_line)
+                               int          char_on_line)
 {
   GtkTextRealIter *real;
-  gint chars_in_line;
+  int chars_in_line;
   
   g_return_if_fail (iter != NULL);
 
@@ -3805,10 +3805,10 @@ gtk_text_iter_set_line_offset (GtkTextIter *iter,
  **/
 void
 gtk_text_iter_set_line_index (GtkTextIter *iter,
-                              gint         byte_on_line)
+                              int          byte_on_line)
 {
   GtkTextRealIter *real;
-  gint bytes_in_line;
+  int bytes_in_line;
   
   g_return_if_fail (iter != NULL);
 
@@ -3850,9 +3850,9 @@ gtk_text_iter_set_line_index (GtkTextIter *iter,
  **/
 void
 gtk_text_iter_set_visible_line_offset (GtkTextIter *iter,
-                                       gint         char_on_line)
+                                       int          char_on_line)
 {
-  gint chars_seen = 0;
+  int chars_seen = 0;
   GtkTextIter pos;
 
   g_return_if_fail (iter != NULL);
@@ -3891,10 +3891,10 @@ gtk_text_iter_set_visible_line_offset (GtkTextIter *iter,
  **/
 void
 gtk_text_iter_set_visible_line_index (GtkTextIter *iter,
-                                      gint         byte_on_line)
+                                      int          byte_on_line)
 {
   GtkTextRealIter *real;
-  gint offset = 0;
+  int offset = 0;
   GtkTextIter pos;
   GtkTextLineSegment *seg;
   
@@ -3952,10 +3952,10 @@ gtk_text_iter_set_visible_line_index (GtkTextIter *iter,
  **/
 void
 gtk_text_iter_set_line (GtkTextIter *iter,
-                        gint         line_number)
+                        int          line_number)
 {
   GtkTextLine *line;
-  gint real_line;
+  int real_line;
   GtkTextRealIter *real;
 
   g_return_if_fail (iter != NULL);
@@ -3987,12 +3987,12 @@ gtk_text_iter_set_line (GtkTextIter *iter,
  **/
 void
 gtk_text_iter_set_offset (GtkTextIter *iter,
-                          gint         char_offset)
+                          int          char_offset)
 {
   GtkTextLine *line;
   GtkTextRealIter *real;
-  gint line_start;
-  gint real_char_index;
+  int line_start;
+  int real_char_index;
 
   g_return_if_fail (iter != NULL);
 
@@ -4094,8 +4094,8 @@ find_paragraph_delimiter_for_line (GtkTextIter *iter)
 gboolean
 gtk_text_iter_forward_to_line_end (GtkTextIter *iter)
 {
-  gint current_offset;
-  gint new_offset;
+  int current_offset;
+  int new_offset;
 
   
   g_return_val_if_fail (iter != NULL, FALSE);
@@ -4317,7 +4317,7 @@ matches_pred (GtkTextIter *iter,
               GtkTextCharPredicate pred,
               gpointer user_data)
 {
-  gint ch;
+  int ch;
 
   ch = gtk_text_iter_get_char (iter);
 
@@ -4399,12 +4399,12 @@ gtk_text_iter_backward_find_char (GtkTextIter         *iter,
 
 static void
 forward_chars_with_skipping (GtkTextIter *iter,
-                             gint         count,
+                             int          count,
                              gboolean     skip_invisible,
                              gboolean     skip_nontext,
                              gboolean     skip_decomp)
 {
-  gint i;
+  int i;
 
   g_return_if_fail (count >= 0);
 
@@ -4436,7 +4436,7 @@ forward_chars_with_skipping (GtkTextIter *iter,
           gchar *normal;
           gchar *casefold;
           gchar buffer[6];
-          gint buffer_len;
+          int buffer_len;
 
           buffer_len = g_unichar_to_utf8 (gtk_text_iter_get_char (iter), buffer);
           casefold = g_utf8_casefold (buffer, buffer_len);
@@ -4455,7 +4455,7 @@ forward_chars_with_skipping (GtkTextIter *iter,
 
 static const gchar *
 pointer_from_offset_skipping_decomp (const gchar *str,
-                                     gint         offset)
+                                     int          offset)
 {
   gchar *casefold, *normal;
   const gchar *p, *q;
@@ -4508,7 +4508,7 @@ utf8_strcasestr (const gchar *haystack,
   gchar *p;
   gchar *casefold;
   gchar *caseless_haystack;
-  gint i;
+  int i;
 
   g_return_val_if_fail (haystack != NULL, NULL);
   g_return_val_if_fail (needle != NULL, NULL);
@@ -4564,7 +4564,7 @@ utf8_strrcasestr (const gchar *haystack,
   gchar *p;
   gchar *casefold;
   gchar *caseless_haystack;
-  gint i;
+  int i;
 
   g_return_val_if_fail (haystack != NULL, NULL);
   g_return_val_if_fail (needle != NULL, NULL);
@@ -4624,8 +4624,8 @@ utf8_caselessnmatch (const gchar *s1,
   gchar *casefold;
   gchar *normalized_s1;
   gchar *normalized_s2;
-  gint len_s1;
-  gint len_s2;
+  int len_s1;
+  int len_s2;
   gboolean ret = FALSE;
 
   g_return_val_if_fail (s1 != NULL, FALSE);
@@ -4665,7 +4665,7 @@ lines_match (const GtkTextIter *start,
   GtkTextIter next;
   gchar *line_text;
   const gchar *found;
-  gint offset;
+  int offset;
 
   if (*lines == NULL || **lines == '\0')
     {
@@ -4765,8 +4765,8 @@ lines_match (const GtkTextIter *start,
 static gchar **
 strbreakup (const char *string,
             const char *delimiter,
-            gint        max_tokens,
-            gint       *num_strings,
+            int         max_tokens,
+            int        *num_strings,
             gboolean    case_insensitive)
 {
   GSList *string_list = NULL, *slist;
@@ -4968,8 +4968,8 @@ vectors_equal_ignoring_trailing (gchar    **vec1,
 
   while (*i1 && *i2)
     {
-      gint len1;
-      gint len2;
+      int len1;
+      int len2;
 
       if (!case_insensitive)
         {
@@ -5037,7 +5037,7 @@ typedef struct _LinesWindow LinesWindow;
 
 struct _LinesWindow
 {
-  gint n_lines;
+  int n_lines;
   gchar **lines;
 
   GtkTextIter first_line_start;
@@ -5051,7 +5051,7 @@ static void
 lines_window_init (LinesWindow       *win,
                    const GtkTextIter *start)
 {
-  gint i;
+  int i;
   GtkTextIter line_start;
   GtkTextIter line_end;
 
@@ -5196,7 +5196,7 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
 {
   gchar **lines = NULL;
   gchar **l;
-  gint n_lines;
+  int n_lines;
   LinesWindow win;
   gboolean retval = FALSE;
   gboolean visible_only;
@@ -5272,7 +5272,7 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
                                            case_insensitive))
         {
           /* Match! */
-          gint offset;
+          int offset;
           GtkTextIter start_tmp;
           GtkTextIter end_tmp;
 
@@ -5391,7 +5391,7 @@ _gtk_text_iter_same_line (const GtkTextIter *lhs,
  * 
  * Returns: -1 if @lhs is less than @rhs, 1 if @lhs is greater, 0 if they are equal
  **/
-gint
+int
 gtk_text_iter_compare (const GtkTextIter *lhs,
                        const GtkTextIter *rhs)
 {
@@ -5410,7 +5410,7 @@ gtk_text_iter_compare (const GtkTextIter *lhs,
   
   if (real_lhs->line == real_rhs->line)
     {
-      gint left_index, right_index;
+      int left_index, right_index;
 
       if (real_lhs->line_byte_offset >= 0 &&
           real_rhs->line_byte_offset >= 0)
@@ -5437,7 +5437,7 @@ gtk_text_iter_compare (const GtkTextIter *lhs,
     }
   else
     {
-      gint line1, line2;
+      int line1, line2;
 
       line1 = gtk_text_iter_get_line (lhs);
       line2 = gtk_text_iter_get_line (rhs);
@@ -5512,11 +5512,11 @@ gtk_text_iter_order (GtkTextIter *first,
 void
 _gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
                                   GtkTextIter *iter,
-                                  gint char_index)
+                                  int char_index)
 {
   GtkTextRealIter *real = (GtkTextRealIter*)iter;
-  gint real_char_index;
-  gint line_start;
+  int real_char_index;
+  int line_start;
   GtkTextLine *line;
 
   g_return_if_fail (iter != NULL);
@@ -5535,12 +5535,12 @@ _gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
 void
 _gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
                                        GtkTextIter  *iter,
-                                       gint          line_number,
-                                       gint          char_on_line)
+                                       int           line_number,
+                                       int           char_on_line)
 {
   GtkTextRealIter *real = (GtkTextRealIter*)iter;
   GtkTextLine *line;
-  gint real_line;
+  int real_line;
 
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
@@ -5558,12 +5558,12 @@ _gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
 void
 _gtk_text_btree_get_iter_at_line_byte (GtkTextBTree   *tree,
                                        GtkTextIter    *iter,
-                                       gint            line_number,
-                                       gint            byte_index)
+                                       int             line_number,
+                                       int             byte_index)
 {
   GtkTextRealIter *real = (GtkTextRealIter*)iter;
   GtkTextLine *line;
-  gint real_line;
+  int real_line;
 
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
@@ -5582,7 +5582,7 @@ void
 _gtk_text_btree_get_iter_at_line      (GtkTextBTree   *tree,
                                        GtkTextIter    *iter,
                                        GtkTextLine    *line,
-                                       gint            byte_offset)
+                                       int             byte_offset)
 {
   g_return_if_fail (iter != NULL);
   g_return_if_fail (tree != NULL);
@@ -5739,7 +5739,7 @@ void
 _gtk_text_iter_check (const GtkTextIter *iter)
 {
   const GtkTextRealIter *real = (const GtkTextRealIter*)iter;
-  gint line_char_offset, line_byte_offset, seg_char_offset, seg_byte_offset;
+  int line_char_offset, line_byte_offset, seg_char_offset, seg_byte_offset;
   GtkTextLineSegment *byte_segment = NULL;
   GtkTextLineSegment *byte_any_segment = NULL;
   GtkTextLineSegment *char_segment = NULL;
@@ -5866,8 +5866,8 @@ _gtk_text_iter_check (const GtkTextIter *iter)
          segment. */
       if (char_segment->type == &gtk_text_char_type)
         {
-          gint byte_offset = 0;
-          gint char_offset = 0;
+          int byte_offset = 0;
+          int char_offset = 0;
           while (char_offset < seg_char_offset)
             {
               const char * start = char_segment->body.chars + byte_offset;
@@ -5891,7 +5891,7 @@ _gtk_text_iter_check (const GtkTextIter *iter)
 
   if (real->cached_line_number >= 0)
     {
-      gint should_be;
+      int should_be;
 
       should_be = _gtk_text_line_get_number (real->line);
       if (real->cached_line_number != should_be)
@@ -5904,7 +5904,7 @@ _gtk_text_iter_check (const GtkTextIter *iter)
                                           efficiently, not a real
                                           invariant. */
         {
-          gint char_index;
+          int char_index;
 
           char_index = _gtk_text_line_char_index (real->line);
           char_index += real->line_char_offset;
index 9655bcfe66e3f6e5ec52a6171ba8e38ffe4e2ede..31bf5ea61b8a0b05b5da7a070db7b3deccb293a0 100644 (file)
@@ -74,18 +74,18 @@ struct _GtkTextIter {
   /*< private >*/
   gpointer dummy1;
   gpointer dummy2;
-  gint dummy3;
-  gint dummy4;
-  gint dummy5;
-  gint dummy6;
-  gint dummy7;
-  gint dummy8;
+  int dummy3;
+  int dummy4;
+  int dummy5;
+  int dummy6;
+  int dummy7;
+  int dummy8;
   gpointer dummy9;
   gpointer dummy10;
-  gint dummy11;
-  gint dummy12;
+  int dummy11;
+  int dummy12;
   /* padding */
-  gint dummy13;
+  int dummy13;
   gpointer dummy14;
 };
 
@@ -115,18 +115,18 @@ GType        gtk_text_iter_get_type (void) G_GNUC_CONST;
  */
 
 GDK_AVAILABLE_IN_ALL
-gint gtk_text_iter_get_offset      (const GtkTextIter *iter);
+int gtk_text_iter_get_offset      (const GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
-gint gtk_text_iter_get_line        (const GtkTextIter *iter);
+int gtk_text_iter_get_line        (const GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
-gint gtk_text_iter_get_line_offset (const GtkTextIter *iter);
+int gtk_text_iter_get_line_offset (const GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
-gint gtk_text_iter_get_line_index  (const GtkTextIter *iter);
+int gtk_text_iter_get_line_index  (const GtkTextIter *iter);
 
 GDK_AVAILABLE_IN_ALL
-gint gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter);
+int gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
-gint gtk_text_iter_get_visible_line_index (const GtkTextIter *iter);
+int gtk_text_iter_get_visible_line_index (const GtkTextIter *iter);
 
 
 /*
@@ -214,9 +214,9 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_is_cursor_position (const GtkTextIter   *iter);
 
 GDK_AVAILABLE_IN_ALL
-gint     gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
+int      gtk_text_iter_get_chars_in_line (const GtkTextIter   *iter);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
+int      gtk_text_iter_get_bytes_in_line (const GtkTextIter   *iter);
 
 GDK_AVAILABLE_IN_ALL
 PangoLanguage* gtk_text_iter_get_language   (const GtkTextIter *iter);
@@ -235,30 +235,30 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_char        (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_chars        (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_chars       (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_line         (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_line        (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_lines        (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_lines       (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_word_end     (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_word_start  (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_word_ends    (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_word_starts (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_line   (GtkTextIter *iter);
@@ -266,10 +266,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_line  (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_lines  (GtkTextIter *iter,
-                                               gint         count);
+                                               int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_lines (GtkTextIter *iter,
-                                               gint         count);
+                                               int          count);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_word_end     (GtkTextIter *iter);
@@ -277,10 +277,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_word_start  (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_word_ends    (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_word_starts (GtkTextIter *iter,
-                                             gint         count);
+                                             int          count);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_sentence_end     (GtkTextIter *iter);
@@ -288,10 +288,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_sentence_start  (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_sentence_ends    (GtkTextIter *iter,
-                                                 gint         count);
+                                                 int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_sentence_starts (GtkTextIter *iter,
-                                                 gint         count);
+                                                 int          count);
 /* cursor positions are almost equivalent to chars, but not quite;
  * in some languages, you can’t put the cursor between certain
  * chars. Also, you can’t put the cursor between \r\n at the end
@@ -303,10 +303,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_cursor_position  (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_cursor_positions  (GtkTextIter *iter,
-                                                  gint         count);
+                                                  int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_cursor_positions (GtkTextIter *iter,
-                                                  gint         count);
+                                                  int          count);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_cursor_position   (GtkTextIter *iter);
@@ -314,23 +314,23 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_cursor_position  (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_forward_visible_cursor_positions  (GtkTextIter *iter,
-                                                          gint         count);
+                                                          int          count);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_backward_visible_cursor_positions (GtkTextIter *iter,
-                                                          gint         count);
+                                                          int          count);
 
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_offset         (GtkTextIter *iter,
-                                           gint         char_offset);
+                                           int          char_offset);
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_line           (GtkTextIter *iter,
-                                           gint         line_number);
+                                           int          line_number);
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_line_offset    (GtkTextIter *iter,
-                                           gint         char_on_line);
+                                           int          char_on_line);
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_line_index     (GtkTextIter *iter,
-                                           gint         byte_on_line);
+                                           int          byte_on_line);
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_forward_to_end     (GtkTextIter *iter);
 GDK_AVAILABLE_IN_ALL
@@ -338,10 +338,10 @@ gboolean gtk_text_iter_forward_to_line_end (GtkTextIter *iter);
 
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_visible_line_offset (GtkTextIter *iter,
-                                                gint         char_on_line);
+                                                int          char_on_line);
 GDK_AVAILABLE_IN_ALL
 void     gtk_text_iter_set_visible_line_index  (GtkTextIter *iter,
-                                                gint         byte_on_line);
+                                                int          byte_on_line);
 
 /* returns TRUE if a toggle was found; NULL for the tag pointer
  * means “any tag toggle”, otherwise the next toggle of the
@@ -391,7 +391,7 @@ GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_equal           (const GtkTextIter *lhs,
                                         const GtkTextIter *rhs);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_text_iter_compare         (const GtkTextIter *lhs,
+int      gtk_text_iter_compare         (const GtkTextIter *lhs,
                                         const GtkTextIter *rhs);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_iter_in_range        (const GtkTextIter *iter,
index 8db3f56b934788d964099ba3864da0e888cc391b..e9503995f7e9c12610e25dee5522943763b74aa9 100644 (file)
@@ -39,8 +39,8 @@ GtkTextLine *       _gtk_text_iter_get_text_line              (const GtkTextIter
 GtkTextBTree *      _gtk_text_iter_get_btree                  (const GtkTextIter *iter);
 gboolean            _gtk_text_iter_forward_indexable_segment  (GtkTextIter       *iter);
 gboolean            _gtk_text_iter_backward_indexable_segment (GtkTextIter       *iter);
-gint                _gtk_text_iter_get_segment_byte           (const GtkTextIter *iter);
-gint                _gtk_text_iter_get_segment_char           (const GtkTextIter *iter);
+int                 _gtk_text_iter_get_segment_byte           (const GtkTextIter *iter);
+int                 _gtk_text_iter_get_segment_char           (const GtkTextIter *iter);
 gboolean            _gtk_text_iter_same_line                  (const GtkTextIter *lhs,
                                                                const GtkTextIter *rhs);
 
index fb2d1502304353571da308f76c5c5d4f8438c726..7ced6f31a7750eab359ca6dc50fa774de8980418 100644 (file)
@@ -119,9 +119,9 @@ static void gtk_text_layout_invalidate_cache       (GtkTextLayout     *layout,
 static void gtk_text_layout_invalidate_cursor_line (GtkTextLayout     *layout,
                                                    gboolean           cursors_only);
 static void gtk_text_layout_emit_changed           (GtkTextLayout     *layout,
-                                                   gint               y,
-                                                   gint               old_height,
-                                                   gint               new_height);
+                                                   int                y,
+                                                   int                old_height,
+                                                   int                new_height);
 
 static void gtk_text_layout_invalidate_all (GtkTextLayout *layout);
 
@@ -134,7 +134,7 @@ static void gtk_text_layout_after_mark_set_handler     (GtkTextBuffer     *buffe
 static void gtk_text_layout_after_buffer_insert_text   (GtkTextBuffer     *textbuffer,
                                                         GtkTextIter       *iter,
                                                         gchar             *str,
-                                                        gint               len,
+                                                        int                len,
                                                         gpointer           data);
 static void gtk_text_layout_after_buffer_delete_range  (GtkTextBuffer     *textbuffer,
                                                         GtkTextIter       *start,
@@ -147,7 +147,7 @@ static void gtk_text_layout_before_mark_set_handler    (GtkTextBuffer     *buffe
 static void gtk_text_layout_before_buffer_insert_text  (GtkTextBuffer     *textbuffer,
                                                         GtkTextIter       *iter,
                                                         gchar             *str,
-                                                        gint               len,
+                                                        int                len,
                                                         gpointer           data);
 static void gtk_text_layout_before_buffer_delete_range (GtkTextBuffer     *textbuffer,
                                                         GtkTextIter       *start,
@@ -155,17 +155,17 @@ static void gtk_text_layout_before_buffer_delete_range (GtkTextBuffer     *textb
                                                         gpointer           data);
 
 
-static void gtk_text_layout_update_cursor_line (GtkTextLayout *layout);
+static void gtk_text_layout_update_cursor_line         (GtkTextLayout     *layout);
 
-static void line_display_index_to_iter (GtkTextLayout      *layout,
-                                       GtkTextLineDisplay *display,
-                                       GtkTextIter        *iter,
-                                        gint                index,
-                                        gint                trailing);
+static void line_display_index_to_iter                 (GtkTextLayout     *layout,
+                                                        GtkTextLineDisplay*display,
+                                                        GtkTextIter       *iter,
+                                                        int                index,
+                                                        int                trailing);
 
-static gint line_display_iter_to_index (GtkTextLayout      *layout,
-                                        GtkTextLineDisplay *display,
-                                        const GtkTextIter  *iter);
+static int line_display_iter_to_index                  (GtkTextLayout     *layout,
+                                                        GtkTextLineDisplay*display,
+                                                        const GtkTextIter *iter);
 
 enum {
   INVALIDATED,
@@ -509,7 +509,7 @@ gtk_text_layout_get_buffer (GtkTextLayout *layout)
 }
 
 void
-gtk_text_layout_set_screen_width (GtkTextLayout *layout, gint width)
+gtk_text_layout_set_screen_width (GtkTextLayout *layout, int width)
 {
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
   g_return_if_fail (width >= 0);
@@ -543,7 +543,7 @@ gtk_text_layout_set_cursor_visible (GtkTextLayout *layout,
   if (layout->cursor_visible != cursor_visible)
     {
       GtkTextIter iter;
-      gint y, height;
+      int y, height;
 
       layout->cursor_visible = cursor_visible;
 
@@ -589,7 +589,7 @@ void
 gtk_text_layout_set_preedit_string (GtkTextLayout *layout,
                                    const gchar   *preedit_string,
                                    PangoAttrList *preedit_attrs,
-                                   gint           cursor_pos)
+                                   int            cursor_pos)
 {
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
   g_return_if_fail (preedit_attrs != NULL || preedit_string == NULL);
@@ -622,8 +622,8 @@ gtk_text_layout_set_preedit_string (GtkTextLayout *layout,
 
 void
 gtk_text_layout_get_size (GtkTextLayout *layout,
-                          gint *width,
-                          gint *height)
+                          int *width,
+                          int *height)
 {
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
 
@@ -642,18 +642,18 @@ gtk_text_layout_invalidated (GtkTextLayout *layout)
 
 static void
 gtk_text_layout_emit_changed (GtkTextLayout *layout,
-                             gint           y,
-                             gint           old_height,
-                             gint           new_height)
+                             int            y,
+                             int            old_height,
+                             int            new_height)
 {
   g_signal_emit (layout, signals[CHANGED], 0, y, old_height, new_height);
 }
 
 void
 gtk_text_layout_changed (GtkTextLayout *layout,
-                         gint           y,
-                         gint           old_height,
-                         gint           new_height)
+                         int            y,
+                         int            old_height,
+                         int            new_height)
 {
   GtkTextLayoutPrivate *priv = GTK_TEXT_LAYOUT_GET_PRIVATE (layout);
   gtk_text_line_display_cache_invalidate_y_range (priv->cache, layout, y, old_height, FALSE);
@@ -662,9 +662,9 @@ gtk_text_layout_changed (GtkTextLayout *layout,
 
 void
 gtk_text_layout_cursors_changed (GtkTextLayout *layout,
-                                 gint           y,
-                                 gint           old_height,
-                                 gint           new_height)
+                                 int            y,
+                                 int            old_height,
+                                 int            new_height)
 {
   GtkTextLayoutPrivate *priv = GTK_TEXT_LAYOUT_GET_PRIVATE (layout);
   gtk_text_line_display_cache_invalidate_y_range (priv->cache, layout, y, old_height, TRUE);
@@ -680,9 +680,9 @@ gtk_text_layout_cursors_changed (GtkTextLayout *layout,
 GSList*
 gtk_text_layout_get_lines (GtkTextLayout *layout,
                            /* [top_y, bottom_y) */
-                           gint top_y,
-                           gint bottom_y,
-                           gint *first_line_y)
+                           int top_y,
+                           int bottom_y,
+                           int *first_line_y)
 {
   GtkTextLine *first_btree_line;
   GtkTextLine *last_btree_line;
@@ -947,16 +947,16 @@ update_layout_size (GtkTextLayout *layout)
 void
 gtk_text_layout_validate_yrange (GtkTextLayout *layout,
                                  GtkTextIter   *anchor,
-                                 gint           y0,
-                                 gint           y1)
+                                 int            y0,
+                                 int            y1)
 {
   GtkTextLine *line;
   GtkTextLine *first_line = NULL;
   GtkTextLine *last_line = NULL;
-  gint seen;
-  gint delta_height = 0;
-  gint first_line_y = 0;        /* Quiet GCC */
-  gint last_line_y = 0;         /* Quiet GCC */
+  int seen;
+  int delta_height = 0;
+  int first_line_y = 0;        /* Quiet GCC */
+  int last_line_y = 0;         /* Quiet GCC */
 
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
 
@@ -975,8 +975,8 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
       GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
       if (!line_data || !line_data->valid)
         {
-          gint old_height, new_height;
-          gint top_ink, bottom_ink;
+          int old_height, new_height;
+          int top_ink, bottom_ink;
          
          old_height = line_data ? line_data->height : 0;
           top_ink = line_data ? line_data->top_ink : 0;
@@ -1016,8 +1016,8 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
       GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
       if (!line_data || !line_data->valid)
         {
-          gint old_height, new_height;
-          gint top_ink, bottom_ink;
+          int old_height, new_height;
+          int top_ink, bottom_ink;
          
          old_height = line_data ? line_data->height : 0;
           top_ink = line_data ? line_data->top_ink : 0;
@@ -1053,7 +1053,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
    */
   if (first_line)
     {
-      gint line_top;
+      int line_top;
 
       update_layout_size (layout);
 
@@ -1078,9 +1078,9 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
  **/
 void
 gtk_text_layout_validate (GtkTextLayout *layout,
-                          gint           max_pixels)
+                          int            max_pixels)
 {
-  gint y, old_height, new_height;
+  int y, old_height, new_height;
 
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
 
@@ -1266,8 +1266,8 @@ set_para_values (GtkTextLayout      *layout,
 {
   PangoAlignment pango_align = PANGO_ALIGN_LEFT;
   PangoWrapMode pango_wrap = PANGO_WRAP_WORD;
-  gint h_margin;
-  gint h_padding;
+  int h_margin;
+  int h_padding;
 
   switch (base_dir)
     {
@@ -1515,9 +1515,9 @@ gtk_text_attr_appearance_new (const GtkTextAppearance *appearance)
 static void
 add_generic_attrs (GtkTextLayout      *layout,
                    GtkTextAppearance  *appearance,
-                   gint                byte_count,
+                   int                 byte_count,
                    PangoAttrList      *attrs,
-                   gint                start,
+                   int                 start,
                    gboolean            size_only,
                    gboolean            is_text)
 {
@@ -1615,9 +1615,9 @@ add_generic_attrs (GtkTextLayout      *layout,
 static void
 add_text_attrs (GtkTextLayout      *layout,
                 GtkTextAttributes  *style,
-                gint                byte_count,
+                int                 byte_count,
                 PangoAttrList      *attrs,
-                gint                start,
+                int                 start,
                 gboolean            size_only,
                 PangoAttribute    **last_font_attr,
                 PangoAttribute    **last_scale_attr,
@@ -1729,12 +1729,12 @@ add_paintable_attrs (GtkTextLayout      *layout,
                      GtkTextAttributes  *style,
                      GtkTextLineSegment *seg,
                      PangoAttrList      *attrs,
-                     gint                start)
+                     int                 start)
 {
   PangoAttribute *attr;
   PangoRectangle logical_rect;
   GtkTextPaintable *paintable = &seg->body.paintable;
-  gint width, height;
+  int width, height;
 
   width = gdk_paintable_get_intrinsic_width (paintable->paintable);
   height = gdk_paintable_get_intrinsic_height (paintable->paintable);
@@ -1768,11 +1768,11 @@ add_child_attrs (GtkTextLayout      *layout,
                  GtkTextAttributes  *style,
                  GtkTextLineSegment *seg,
                  PangoAttrList      *attrs,
-                 gint                start)
+                 int                 start)
 {
   PangoAttribute *attr;
   PangoRectangle logical_rect;
-  gint width, height;
+  int width, height;
   GSList *tmp_list;
   GtkWidget *widget = NULL;
 
@@ -1849,7 +1849,7 @@ static gboolean
 get_block_cursor (GtkTextLayout      *layout,
                  GtkTextLineDisplay *display,
                  const GtkTextIter  *insert_iter,
-                 gint                insert_index,
+                 int                 insert_index,
                  GdkRectangle       *pos,
                  gboolean           *cursor_at_line_end)
 {
@@ -1880,7 +1880,7 @@ static void
 add_cursor (GtkTextLayout      *layout,
             GtkTextLineDisplay *display,
             GtkTextLineSegment *seg,
-            gint                start)
+            int                 start)
 {
   CursorPosition cursor;
 
@@ -1953,7 +1953,7 @@ allocate_child_widgets (GtkTextLayout      *text_layout,
 
       if (run && is_shape (run))
         {
-          gint byte_index;
+          int byte_index;
           GtkTextIter text_iter;
           GtkTextChildAnchor *anchor = NULL;
           GtkWidget **widgets = NULL;
@@ -2020,7 +2020,7 @@ static void
 add_preedit_attrs (GtkTextLayout     *layout,
                   GtkTextAttributes *style,
                   PangoAttrList     *attrs,
-                  gint               offset,
+                  int                offset,
                   gboolean           size_only)
 {
   PangoAttrIterator *iter = pango_attr_list_get_iterator (layout->preedit_attrs);
@@ -2033,7 +2033,7 @@ add_preedit_attrs (GtkTextLayout     *layout,
       GSList *extra_attrs = NULL;
       GSList *tmp_list;
       PangoLanguage *language;
-      gint start, end;
+      int start, end;
 
       pango_attr_iterator_range (iter, &start, &end);
 
@@ -2163,7 +2163,7 @@ gtk_text_layout_update_display_cursors (GtkTextLayout      *layout,
 {
   GtkTextLineSegment *seg;
   GtkTextIter iter;
-  gint layout_byte_offset, buffer_byte_offset;
+  int layout_byte_offset, buffer_byte_offset;
   GSList *cursor_byte_offsets = NULL;
   GSList *cursor_segs = NULL;
   GSList *tmp_list1, *tmp_list2;
@@ -2204,7 +2204,7 @@ gtk_text_layout_update_display_cursors (GtkTextLayout      *layout,
       else if (seg->type == &gtk_text_right_mark_type ||
                seg->type == &gtk_text_left_mark_type)
         {
-         gint cursor_offset = 0;
+         int cursor_offset = 0;
 
          /* At the insertion point, add the preedit string, if any */
 
@@ -2263,7 +2263,7 @@ get_tags_array_at_iter (GtkTextIter *iter)
 {
   GtkTextTag **tags;
   GPtrArray *array = NULL;
-  gint n_tags;
+  int n_tags;
 
   tags = _gtk_text_btree_get_tags (iter, &n_tags);
 
@@ -2284,7 +2284,7 @@ static GPtrArray *
 tags_array_toggle_tag (GPtrArray  *array,
                       GtkTextTag *tag)
 {
-  gint pos;
+  int pos;
   GtkTextTag **tags;
 
   if (array == NULL)
@@ -2319,9 +2319,9 @@ gtk_text_layout_create_display (GtkTextLayout *layout,
   GtkTextIter iter;
   GtkTextAttributes *style;
   gchar *text;
-  gint text_pixel_width;
+  int text_pixel_width;
   PangoAttrList *attrs;
-  gint text_allocated, layout_byte_offset, buffer_byte_offset;
+  int text_allocated, layout_byte_offset, buffer_byte_offset;
   PangoRectangle extents;
   gboolean para_values_set = FALSE;
   GSList *cursor_byte_offsets = NULL;
@@ -2331,8 +2331,8 @@ gtk_text_layout_create_display (GtkTextLayout *layout,
   PangoDirection base_dir;
   GPtrArray *tags;
   gboolean initial_toggle_segments;
-  gint h_margin;
-  gint h_padding;
+  int h_margin;
+  int h_padding;
   PangoAttribute *last_font_attr = NULL;
   PangoAttribute *last_scale_attr = NULL;
   PangoAttribute *last_fallback_attr = NULL;
@@ -2418,7 +2418,7 @@ gtk_text_layout_create_display (GtkTextLayout *layout,
                    * if there are toggles in-between
                    */
 
-                  gint bytes = 0;
+                  int bytes = 0;
                   GtkTextLineSegment *prev_seg = NULL;
   
                   while (seg)
@@ -2531,7 +2531,7 @@ gtk_text_layout_create_display (GtkTextLayout *layout,
       else if (seg->type == &gtk_text_right_mark_type ||
                seg->type == &gtk_text_left_mark_type)
         {
-          gint cursor_offset = 0;
+          int cursor_offset = 0;
           
           /* At the insertion point, add the preedit string, if any */
           
@@ -2638,7 +2638,7 @@ gtk_text_layout_create_display (GtkTextLayout *layout,
    */
   if (pango_layout_get_width (display->layout) < 0)
     {
-      gint excess = display->total_width - text_pixel_width;
+      int excess = display->total_width - text_pixel_width;
 
       switch (pango_layout_get_alignment (display->layout))
         {
@@ -2708,12 +2708,12 @@ gtk_text_line_display_unref (GtkTextLineDisplay *display)
 /* Functions to convert iter <=> index for the line of a GtkTextLineDisplay
  * taking into account the preedit string and invisible text if necessary.
  */
-static gint
+static int
 line_display_iter_to_index (GtkTextLayout      *layout,
                            GtkTextLineDisplay *display,
                            const GtkTextIter  *iter)
 {
-  gint index;
+  int index;
 
   g_return_val_if_fail (_gtk_text_iter_get_text_line (iter) == display->line, 0);
 
@@ -2732,8 +2732,8 @@ static void
 line_display_index_to_iter (GtkTextLayout      *layout,
                            GtkTextLineDisplay *display,
                            GtkTextIter        *iter,
-                           gint                index,
-                           gint                trailing)
+                           int                 index,
+                           int                 trailing)
 {
   g_return_if_fail (!_gtk_text_line_is_last (display->line,
                                              _gtk_text_buffer_get_btree (layout->buffer)));
@@ -2768,9 +2768,9 @@ line_display_index_to_iter (GtkTextLayout      *layout,
 
 static void
 get_line_at_y (GtkTextLayout *layout,
-               gint           y,
+               int            y,
                GtkTextLine  **line,
-               gint          *line_top)
+               int           *line_top)
 {
   if (y < 0)
     y = 0;
@@ -2804,8 +2804,8 @@ get_line_at_y (GtkTextLayout *layout,
 void
 gtk_text_layout_get_line_at_y (GtkTextLayout *layout,
                                GtkTextIter   *target_iter,
-                               gint           y,
-                               gint          *line_top)
+                               int            y,
+                               int           *line_top)
 {
   GtkTextLine *line;
 
@@ -2819,10 +2819,10 @@ gtk_text_layout_get_line_at_y (GtkTextLayout *layout,
 gboolean
 gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
                                    GtkTextIter   *target_iter,
-                                   gint           x,
-                                   gint           y)
+                                   int            x,
+                                   int            y)
 {
-  gint trailing;
+  int trailing;
   gboolean inside;
 
   inside = gtk_text_layout_get_iter_at_position (layout, target_iter, &trailing, x, y);
@@ -2835,13 +2835,13 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
 gboolean
 gtk_text_layout_get_iter_at_position (GtkTextLayout *layout,
                                       GtkTextIter   *target_iter,
-                                      gint          *trailing,
-                                      gint           x,
-                                      gint           y)
+                                      int           *trailing,
+                                      int            x,
+                                      int            y)
 {
   GtkTextLine *line;
-  gint byte_index;
-  gint line_top;
+  int byte_index;
+  int line_top;
   GtkTextLineDisplay *display;
   gboolean inside;
 
@@ -2908,8 +2908,8 @@ gtk_text_layout_get_cursor_locations (GtkTextLayout  *layout,
 {
   GtkTextLine *line;
   GtkTextLineDisplay *display;
-  gint line_top;
-  gint index;
+  int line_top;
+  int index;
   GtkTextIter insert_iter;
 
   PangoRectangle pango_strong_pos;
@@ -2989,7 +2989,7 @@ _gtk_text_layout_get_block_cursor (GtkTextLayout *layout,
     }
   else
     {
-      gint index = display->insert_index;
+      int index = display->insert_index;
 
       if (index < 0)
         index = gtk_text_iter_get_line_index (&iter);
@@ -3000,7 +3000,7 @@ _gtk_text_layout_get_block_cursor (GtkTextLayout *layout,
 
   if (block && pos)
     {
-      gint line_top;
+      int line_top;
 
       line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
                                                line, layout);
@@ -3030,8 +3030,8 @@ _gtk_text_layout_get_block_cursor (GtkTextLayout *layout,
 void
 gtk_text_layout_get_line_yrange (GtkTextLayout     *layout,
                                  const GtkTextIter *iter,
-                                 gint              *y,
-                                 gint              *height)
+                                 int               *y,
+                                 int               *height)
 {
   GtkTextLine *line;
 
@@ -3062,8 +3062,8 @@ gtk_text_layout_get_iter_location (GtkTextLayout     *layout,
   GtkTextLine *line;
   GtkTextBTree *tree;
   GtkTextLineDisplay *display;
-  gint byte_index;
-  gint x_offset;
+  int byte_index;
+  int x_offset;
   
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
   g_return_if_fail (_gtk_text_iter_get_btree (iter) == _gtk_text_buffer_get_btree (layout->buffer));
@@ -3099,12 +3099,12 @@ gtk_text_layout_get_iter_location (GtkTextLayout     *layout,
 static void
 find_display_line_below (GtkTextLayout *layout,
                          GtkTextIter   *iter,
-                         gint           y)
+                         int            y)
 {
   GtkTextLine *line, *next;
   GtkTextLine *found_line = NULL;
-  gint line_top;
-  gint found_byte = 0;
+  int line_top;
+  int found_byte = 0;
 
   line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
                                         layout, y, &line_top);
@@ -3129,7 +3129,7 @@ find_display_line_below (GtkTextLayout *layout,
 
       do
         {
-          gint first_y, last_y;
+          int first_y, last_y;
           PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
 
           found_byte = layout_line->start_index;
@@ -3167,12 +3167,12 @@ find_display_line_below (GtkTextLayout *layout,
 static void
 find_display_line_above (GtkTextLayout *layout,
                          GtkTextIter   *iter,
-                         gint           y)
+                         int            y)
 {
   GtkTextLine *line;
   GtkTextLine *found_line = NULL;
-  gint line_top;
-  gint found_byte = 0;
+  int line_top;
+  int found_byte = 0;
 
   line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), layout, y, &line_top);
   if (!line)
@@ -3187,7 +3187,7 @@ find_display_line_above (GtkTextLayout *layout,
       GtkTextLineDisplay *display = gtk_text_layout_get_line_display (layout, line, FALSE);
       PangoRectangle logical_rect;
       PangoLayoutIter *layout_iter;
-      gint tmp_top;
+      int tmp_top;
 
       layout_iter = pango_layout_get_iter (display->layout);
       
@@ -3199,7 +3199,7 @@ find_display_line_above (GtkTextLayout *layout,
 
       do
         {
-          gint first_y, last_y;
+          int first_y, last_y;
           PangoLayoutLine *layout_line = pango_layout_iter_get_line_readonly (layout_iter);
 
           found_byte = layout_line->start_index;
@@ -3248,8 +3248,8 @@ find_display_line_above (GtkTextLayout *layout,
 gboolean
 gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout *layout,
                                       GtkTextIter   *iter,
-                                      gint           top,
-                                      gint           bottom)
+                                      int            top,
+                                      int            bottom)
 {
   GdkRectangle iter_rect;
 
@@ -3292,7 +3292,7 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
 {
   GtkTextLine *line;
   GtkTextLineDisplay *display;
-  gint line_byte;
+  int line_byte;
   GSList *tmp_list;
   PangoLayoutLine *layout_line;
   GtkTextIter orig;
@@ -3369,7 +3369,7 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
     }
   else
     {
-      gint prev_offset = layout_line->start_index;
+      int prev_offset = layout_line->start_index;
 
       tmp_list = tmp_list->next;
       while (tmp_list)
@@ -3412,7 +3412,7 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
 {
   GtkTextLine *line;
   GtkTextLineDisplay *display;
-  gint line_byte;
+  int line_byte;
   GtkTextIter orig;
   gboolean found = FALSE;
   gboolean found_after = FALSE;
@@ -3485,11 +3485,11 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
 gboolean
 gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
                                        GtkTextIter   *iter,
-                                       gint           direction)
+                                       int            direction)
 {
   GtkTextLine *line;
   GtkTextLineDisplay *display;
-  gint line_byte;
+  int line_byte;
   GSList *tmp_list;
   GtkTextIter orig;
   
@@ -3548,7 +3548,7 @@ gtk_text_layout_iter_starts_line (GtkTextLayout       *layout,
 {
   GtkTextLine *line;
   GtkTextLineDisplay *display;
-  gint line_byte;
+  int line_byte;
   GSList *tmp_list;
   
   g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
@@ -3588,7 +3588,7 @@ void
 gtk_text_layout_get_iter_at_line (GtkTextLayout  *layout,
                                   GtkTextIter    *iter,
                                   GtkTextLine    *line,
-                                  gint            byte_offset)
+                                  int             byte_offset)
 {
   _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
                                     iter, line, byte_offset);
@@ -3607,11 +3607,11 @@ gtk_text_layout_get_iter_at_line (GtkTextLayout  *layout,
 void
 gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
                                 GtkTextIter   *iter,
-                                gint           x)
+                                int            x)
 {
   GtkTextLine *line;
   GtkTextLineDisplay *display;
-  gint line_byte;
+  int line_byte;
   PangoLayoutIter *layout_iter;
   
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
@@ -3632,8 +3632,8 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
           pango_layout_iter_at_last_line (layout_iter))
         {
           PangoRectangle logical_rect;
-          gint byte_index, trailing;
-          gint x_offset = display->x_offset * PANGO_SCALE;
+          int byte_index, trailing;
+          int x_offset = display->x_offset * PANGO_SCALE;
 
           pango_layout_iter_get_line_extents (layout_iter, NULL, &logical_rect);
 
@@ -3675,7 +3675,7 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
 gboolean
 gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
                                     GtkTextIter   *iter,
-                                    gint           count)
+                                    int            count)
 {
   GtkTextLineDisplay *display = NULL;
   GtkTextIter orig;
@@ -3689,8 +3689,8 @@ gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
   while (count != 0)
     {
       GtkTextLine *line = _gtk_text_iter_get_text_line (iter);
-      gint line_byte;
-      gint extra_back = 0;
+      int line_byte;
+      int extra_back = 0;
       gboolean strong;
 
       int byte_count = _gtk_text_line_byte_count (line);
@@ -3850,7 +3850,7 @@ static void
 gtk_text_layout_before_buffer_insert_text (GtkTextBuffer *textbuffer,
                                            GtkTextIter   *iter,
                                            gchar         *str,
-                                           gint           len,
+                                           int            len,
                                            gpointer       data)
 {
   GtkTextLayout *layout = GTK_TEXT_LAYOUT (data);
@@ -3864,7 +3864,7 @@ static void
 gtk_text_layout_after_buffer_insert_text (GtkTextBuffer *textbuffer,
                                           GtkTextIter   *iter,
                                           gchar         *str,
-                                          gint           len,
+                                          int            len,
                                           gpointer       data)
 {
   GtkTextLayout *layout = GTK_TEXT_LAYOUT (data);
@@ -4010,8 +4010,8 @@ render_para (GskPangoRenderer   *crenderer,
                (selection_start_index == byte_offset + line->length && pango_layout_iter_at_last_line (iter))) &&
               selection_end_index > byte_offset)
             {
-              gint *ranges = NULL;
-              gint n_ranges, i;
+              int *ranges = NULL;
+              int n_ranges, i;
 
               pango_layout_line_get_x_ranges (line, selection_start_index, selection_end_index, &ranges, &n_ranges);
 
@@ -4136,7 +4136,7 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
   GtkTextLayoutPrivate *priv;
   GskPangoRenderer *crenderer;
   GtkStyleContext *context;
-  gint offset_y;
+  int offset_y;
   GtkTextIter selection_start, selection_end;
   gboolean have_selection;
   GSList *line_list;
@@ -4179,8 +4179,8 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
     {
       GtkTextLine *line = tmp_list->data;
       GtkTextLineDisplay *line_display;
-      gint selection_start_index = -1;
-      gint selection_end_index = -1;
+      int selection_start_index = -1;
+      int selection_end_index = -1;
 
       line_display = gtk_text_layout_get_line_display (layout, line, FALSE);
 
@@ -4191,7 +4191,7 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
           if (have_selection)
             {
               GtkTextIter line_start, line_end;
-              gint byte_count;
+              int byte_count;
 
               gtk_text_layout_get_iter_at_line (layout, &line_start, line, 0);
               line_end = line_start;
@@ -4279,13 +4279,13 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
   gsk_pango_renderer_release (crenderer);
 }
 
-gint
+int
 gtk_text_line_display_compare (const GtkTextLineDisplay *display1,
                                const GtkTextLineDisplay *display2,
                                GtkTextLayout            *layout)
 {
-  gint line1;
-  gint line2;
+  int line1;
+  int line2;
 
   line1 = _gtk_text_line_get_number (display1->line);
   line2 = _gtk_text_line_get_number (display2->line);
index 2f52ae86860aa149b94a206cab361075f3c7e403..e9c56f01e6d1a61a4fc4d69f995b87b981ecd0aa 100644 (file)
@@ -107,24 +107,24 @@ struct _GtkTextLayout
 
   /* width of the display area on-screen,
    * i.e. pixels we should wrap to fit inside. */
-  gint screen_width;
+  int screen_width;
 
   /* width/height of the total logical area being layed out */
-  gint width;
-  gint height;
+  int width;
+  int height;
 
   /* Pixel offsets from the left and from the top to be used when we
    * draw; these allow us to create left/top margins. We don't need
    * anything special for bottom/right margins, because those don't
    * affect drawing.
    */
-  /* gint left_edge; */
-  /* gint top_edge; */
+  /* int left_edge; */
+  /* int top_edge; */
 
   GtkTextBuffer *buffer;
 
-  gint left_padding;
-  gint right_padding;
+  int left_padding;
+  int right_padding;
 
   /* Default style used if no tags override it */
   GtkTextAttributes *default_style;
@@ -139,7 +139,7 @@ struct _GtkTextLayout
   GtkTextAttributes *one_style_cache;
 
   /* Whether we are allowed to wrap right now */
-  gint wrap_loop_count;
+  int wrap_loop_count;
   
   /* Whether to show the insertion cursor */
   guint cursor_visible : 1;
@@ -158,8 +158,8 @@ struct _GtkTextLayout
 
   gchar *preedit_string;
   PangoAttrList *preedit_attrs;
-  gint preedit_len;
-  gint preedit_cursor;
+  int preedit_len;
+  int preedit_cursor;
 
   guint overwrite_mode : 1;
 };
@@ -198,18 +198,18 @@ struct _GtkTextLineDisplay
 
   GtkTextDirection direction;
 
-  gint width;                   /* Width of layout */
-  gint total_width;             /* width - margins, if no width set on layout, if width set on layout, -1 */
-  gint height;
+  int width;                   /* Width of layout */
+  int total_width;             /* width - margins, if no width set on layout, if width set on layout, -1 */
+  int height;
   /* Amount layout is shifted from left edge - this is the left margin
    * plus any other factors, such as alignment or indentation.
    */
-  gint x_offset;
-  gint left_margin;
-  gint right_margin;
-  gint top_margin;
-  gint bottom_margin;
-  gint insert_index;           /* Byte index of insert cursor within para or -1 */
+  int x_offset;
+  int left_margin;
+  int right_margin;
+  int top_margin;
+  int bottom_margin;
+  int insert_index;            /* Byte index of insert cursor within para or -1 */
 
   GtkTextLine *line;
 
@@ -247,23 +247,23 @@ void               gtk_text_layout_set_keyboard_direction (GtkTextLayout     *la
 void               gtk_text_layout_default_style_changed (GtkTextLayout     *layout);
 
 void gtk_text_layout_set_screen_width       (GtkTextLayout     *layout,
-                                             gint               width);
+                                             int                width);
 void gtk_text_layout_set_preedit_string     (GtkTextLayout     *layout,
                                             const gchar       *preedit_string,
                                             PangoAttrList     *preedit_attrs,
-                                            gint               cursor_pos);
+                                            int                cursor_pos);
 
 void     gtk_text_layout_set_cursor_visible (GtkTextLayout     *layout,
                                              gboolean           cursor_visible);
 gboolean gtk_text_layout_get_cursor_visible (GtkTextLayout     *layout);
 
 void    gtk_text_layout_get_size  (GtkTextLayout  *layout,
-                                   gint           *width,
-                                   gint           *height);
+                                   int            *width,
+                                   int            *height);
 GSList* gtk_text_layout_get_lines (GtkTextLayout  *layout,
-                                   gint            top_y,
-                                   gint            bottom_y,
-                                   gint           *first_line_y);
+                                   int             top_y,
+                                   int             bottom_y,
+                                   int            *first_line_y);
 
 void gtk_text_layout_wrap_loop_start (GtkTextLayout *layout);
 void gtk_text_layout_wrap_loop_end   (GtkTextLayout *layout);
@@ -274,23 +274,23 @@ GtkTextLineDisplay* gtk_text_layout_get_line_display  (GtkTextLayout      *layou
 
 GtkTextLineDisplay *gtk_text_line_display_ref         (GtkTextLineDisplay       *display);
 void                gtk_text_line_display_unref       (GtkTextLineDisplay       *display);
-gint                gtk_text_line_display_compare     (const GtkTextLineDisplay *display1,
+int                 gtk_text_line_display_compare     (const GtkTextLineDisplay *display1,
                                                        const GtkTextLineDisplay *display2,
                                                        GtkTextLayout            *layout);
 
 void gtk_text_layout_get_line_at_y     (GtkTextLayout     *layout,
                                         GtkTextIter       *target_iter,
-                                        gint               y,
-                                        gint              *line_top);
+                                        int                y,
+                                        int               *line_top);
 gboolean gtk_text_layout_get_iter_at_pixel (GtkTextLayout     *layout,
                                             GtkTextIter       *iter,
-                                            gint               x,
-                                            gint               y);
+                                            int                x,
+                                            int                y);
 gboolean gtk_text_layout_get_iter_at_position (GtkTextLayout     *layout,
                                                GtkTextIter       *iter,
-                                               gint              *trailing,
-                                               gint               x,
-                                               gint               y);
+                                               int               *trailing,
+                                               int                x,
+                                               int                y);
 void gtk_text_layout_invalidate        (GtkTextLayout     *layout,
                                         const GtkTextIter *start,
                                         const GtkTextIter *end);
@@ -304,29 +304,29 @@ void gtk_text_layout_free_line_data    (GtkTextLayout     *layout,
 gboolean gtk_text_layout_is_valid        (GtkTextLayout *layout);
 void     gtk_text_layout_validate_yrange (GtkTextLayout *layout,
                                           GtkTextIter   *anchor_line,
-                                          gint           y0_,
-                                          gint           y1_);
+                                          int            y0_,
+                                          int            y1_);
 void     gtk_text_layout_validate        (GtkTextLayout *layout,
-                                          gint           max_pixels);
+                                          int            max_pixels);
 
 GtkTextLineData* gtk_text_layout_wrap  (GtkTextLayout   *layout,
                                         GtkTextLine     *line,
                                         GtkTextLineData *line_data);
 void     gtk_text_layout_changed              (GtkTextLayout     *layout,
-                                               gint               y,
-                                               gint               old_height,
-                                               gint               new_height);
+                                               int                y,
+                                               int                old_height,
+                                               int                new_height);
 void     gtk_text_layout_cursors_changed      (GtkTextLayout     *layout,
-                                               gint               y,
-                                               gint               old_height,
-                                               gint               new_height);
+                                               int                y,
+                                               int                old_height,
+                                               int                new_height);
 void     gtk_text_layout_get_iter_location    (GtkTextLayout     *layout,
                                                const GtkTextIter *iter,
                                                GdkRectangle      *rect);
 void     gtk_text_layout_get_line_yrange      (GtkTextLayout     *layout,
                                                const GtkTextIter *iter,
-                                               gint              *y,
-                                               gint              *height);
+                                               int               *y,
+                                               int               *height);
 void     gtk_text_layout_get_cursor_locations (GtkTextLayout     *layout,
                                                GtkTextIter       *iter,
                                                GdkRectangle      *strong_pos,
@@ -341,22 +341,22 @@ gboolean _gtk_text_layout_get_block_cursor    (GtkTextLayout     *layout,
                                               GdkRectangle      *pos);
 gboolean gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout     *layout,
                                                GtkTextIter       *iter,
-                                               gint               top,
-                                               gint               bottom);
+                                               int                top,
+                                               int                bottom);
 
 gboolean gtk_text_layout_move_iter_to_line_end      (GtkTextLayout *layout,
                                                      GtkTextIter   *iter,
-                                                     gint           direction);
+                                                     int            direction);
 gboolean gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
                                                      GtkTextIter   *iter);
 gboolean gtk_text_layout_move_iter_to_next_line     (GtkTextLayout *layout,
                                                      GtkTextIter   *iter);
 void     gtk_text_layout_move_iter_to_x             (GtkTextLayout *layout,
                                                      GtkTextIter   *iter,
-                                                     gint           x);
+                                                     int            x);
 gboolean gtk_text_layout_move_iter_visually         (GtkTextLayout *layout,
                                                      GtkTextIter   *iter,
-                                                     gint           count);
+                                                     int            count);
 
 gboolean gtk_text_layout_iter_starts_line           (GtkTextLayout       *layout,
                                                      const GtkTextIter   *iter);
@@ -364,7 +364,7 @@ gboolean gtk_text_layout_iter_starts_line           (GtkTextLayout       *layout
 void     gtk_text_layout_get_iter_at_line           (GtkTextLayout *layout,
                                                      GtkTextIter    *iter,
                                                      GtkTextLine    *line,
-                                                     gint            byte_offset);
+                                                     int             byte_offset);
 
 void gtk_text_child_anchor_register_child   (GtkTextChildAnchor *anchor,
                                              GtkWidget          *child,
index b6295b6f5509859e185c62cfed773c2aa1442ab0..fa595644ff6f8af404272438f04b52dec8451184 100644 (file)
@@ -39,13 +39,13 @@ struct _GtkTextLineDisplayCache
 
 #if DEBUG_LINE_DISPLAY_CACHE
   guint       log_source;
-  gint        hits;
-  gint        misses;
-  gint        inval;
-  gint        inval_cursors;
-  gint        inval_by_line;
-  gint        inval_by_range;
-  gint        inval_by_y_range;
+  int         hits;
+  int         misses;
+  int         inval;
+  int         inval_cursors;
+  int         inval_by_line;
+  int         inval_by_range;
+  int         inval_by_y_range;
 #endif
 };
 
@@ -151,7 +151,7 @@ check_disposition (GtkTextLineDisplayCache *cache,
                    GtkTextLayout           *layout)
 {
   GSequenceIter *iter;
-  gint last = G_MAXUINT;
+  int last = G_MAXUINT;
 
   g_assert (cache != NULL);
   g_assert (cache->sorted_by_line != NULL);
@@ -571,7 +571,7 @@ gtk_text_line_display_cache_invalidate_range (GtkTextLineDisplayCache *cache,
 static GSequenceIter *
 find_iter_at_at_y (GtkTextLineDisplayCache *cache,
                    GtkTextLayout           *layout,
-                   gint                     y)
+                   int                      y)
 {
   GtkTextBTree *btree;
   GSequenceIter *left;
@@ -599,8 +599,8 @@ find_iter_at_at_y (GtkTextLineDisplayCache *cache,
   for (;;)
     {
       GtkTextLineDisplay *display;
-      gint cache_y;
-      gint cache_height;
+      int cache_y;
+      int cache_height;
 
       if (left == right)
         mid = left;
@@ -651,8 +651,8 @@ find_iter_at_at_y (GtkTextLineDisplayCache *cache,
 void
 gtk_text_line_display_cache_invalidate_y_range (GtkTextLineDisplayCache *cache,
                                                 GtkTextLayout           *layout,
-                                                gint                     y,
-                                                gint                     old_height,
+                                                int                      y,
+                                                int                      old_height,
                                                 gboolean                 cursors_only)
 {
   GSequenceIter *iter;
@@ -672,8 +672,8 @@ gtk_text_line_display_cache_invalidate_y_range (GtkTextLineDisplayCache *cache,
   while (!g_sequence_iter_is_end (iter))
     {
       GtkTextLineDisplay *display;
-      gint cache_y;
-      gint cache_height;
+      int cache_y;
+      int cache_height;
 
       display = g_sequence_get (iter);
       iter = g_sequence_iter_next (iter);
index 89adbffc2ddb3834b4e82fd5d268f15622077f65..ffbe67bd42436660e6f611f1b393a8ed07c55b41 100644 (file)
@@ -50,8 +50,8 @@ void                     gtk_text_line_display_cache_invalidate_range   (GtkText
                                                                          gboolean                 cursors_only);
 void                     gtk_text_line_display_cache_invalidate_y_range (GtkTextLineDisplayCache *cache,
                                                                          GtkTextLayout           *layout,
-                                                                         gint                     y,
-                                                                         gint                     height,
+                                                                         int                      y,
+                                                                         int                      height,
                                                                          gboolean                 cursors_only);
 void                     gtk_text_line_display_cache_set_mru_size       (GtkTextLineDisplayCache *cache,
                                                                          guint                    mru_size);
index 7108637efe91caffc15540e89e8a27b2fc1a7024..a328a420bbfcdc4349f3f8d240a44f66443b99f8 100644 (file)
@@ -72,13 +72,13 @@ struct _GtkTextClass
   void (* activate)           (GtkText         *self);
   void (* move_cursor)        (GtkText         *self,
                                GtkMovementStep  step,
-                               gint             count,
+                               int              count,
                                gboolean         extend);
   void (* insert_at_cursor)   (GtkText         *self,
                                const gchar     *str);
   void (* delete_from_cursor) (GtkText         *self,
                                GtkDeleteType    type,
-                               gint             count);
+                               int              count);
   void (* backspace)          (GtkText         *self);
   void (* cut_clipboard)      (GtkText         *self);
   void (* copy_clipboard)     (GtkText         *self);
index ed987742ff83ea160f0f2b289a9181d65be5c696..119f4b8169c3eb6334ea5b63eb618c4d91a74381 100644 (file)
@@ -48,7 +48,7 @@ typedef struct _GtkTextTagInfo GtkTextTagInfo;
 struct _GtkTextTagInfo {
   GtkTextTag *tag;
   GtkTextBTreeNode *tag_root; /* highest-level node containing the tag */
-  gint toggle_count;      /* total toggles of this tag below tag_root */
+  int toggle_count;      /* total toggles of this tag below tag_root */
 };
 
 /* Body of a segment that toggles a tag on or off */
@@ -64,7 +64,7 @@ struct _GtkTextToggleBody {
 
 /* Split seg at index, returning list of two new segments, and freeing seg */
 typedef GtkTextLineSegment* (*GtkTextSegSplitFunc)      (GtkTextLineSegment *seg,
-                                                         gint                index);
+                                                         int                 index);
 
 /* Delete seg which is contained in line; if tree_gone, the tree is being
  * freed in its entirety, which may matter for some reason (?)
index d001b68ab6b7e7de18c303a61c935d89c2941bcf..03e22e31ab3c580b108abe02760771932d66017e 100644 (file)
@@ -1117,7 +1117,7 @@ set_font_desc_fields (PangoFontDescription *desc,
     pango_font_description_set_stretch (desc, pango_font_description_get_stretch (desc));
   if (to_set & PANGO_FONT_MASK_SIZE)
     {
-      gint size = pango_font_description_get_size (desc);
+      int size = pango_font_description_get_size (desc);
       if (size <= 0)
        {
          size = 10 * PANGO_SCALE;
@@ -2112,9 +2112,9 @@ gtk_text_tag_get_property (GObject      *object,
  */
 
 typedef struct {
-  gint high;
-  gint low;
-  gint delta;
+  int high;
+  int low;
+  int delta;
 } DeltaData;
 
 static void
@@ -2135,7 +2135,7 @@ delta_priority_foreach (GtkTextTag *tag, gpointer user_data)
  * 
  * Returns: The tag’s priority.
  **/
-gint
+int
 gtk_text_tag_get_priority (GtkTextTag *tag)
 {
   g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), 0);
@@ -2162,7 +2162,7 @@ gtk_text_tag_get_priority (GtkTextTag *tag)
  **/
 void
 gtk_text_tag_set_priority (GtkTextTag *tag,
-                           gint        priority)
+                           int         priority)
 {
   GtkTextTagPrivate *priv;
   DeltaData dd;
index a314ab766acc2ea03e1f08d1c9dead6bed1e5132..067aa14a9950cb597bdafa9cf44d673527433478 100644 (file)
@@ -96,10 +96,10 @@ GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkTextTag  *gtk_text_tag_new          (const gchar       *name);
 GDK_AVAILABLE_IN_ALL
-gint         gtk_text_tag_get_priority (GtkTextTag        *tag);
+int          gtk_text_tag_get_priority (GtkTextTag        *tag);
 GDK_AVAILABLE_IN_ALL
 void         gtk_text_tag_set_priority (GtkTextTag        *tag,
-                                        gint               priority);
+                                        int                priority);
 GDK_AVAILABLE_IN_ALL
 void         gtk_text_tag_changed      (GtkTextTag        *tag,
                                         gboolean           size_changed);
index c28621edd689bb208cbaa6ec8f287e295c7d17b4..d3fd18d7806b45e738c14c44c21be01255bf2451 100644 (file)
@@ -87,7 +87,7 @@ struct _GtkTextTagTablePrivate
   GSList     *anonymous;
   GSList     *buffers;
 
-  gint anon_count;
+  int anon_count;
 
   guint seen_invisible : 1;
 };
@@ -463,7 +463,7 @@ gtk_text_tag_table_foreach (GtkTextTagTable       *table,
  * 
  * Returns: number of tags in @table
  **/
-gint
+int
 gtk_text_tag_table_get_size (GtkTextTagTable *table)
 {
   GtkTextTagTablePrivate *priv;
index 58232e753b5d2711e3567e09aede5fb734980425..e4e142c147309e92270365857ec857acd5d3001f 100644 (file)
@@ -63,7 +63,7 @@ void             gtk_text_tag_table_foreach  (GtkTextTagTable        *table,
                                               GtkTextTagTableForeach  func,
                                               gpointer                data);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_tag_table_get_size (GtkTextTagTable        *table);
+int              gtk_text_tag_table_get_size (GtkTextTagTable        *table);
 
 G_END_DECLS
 
index 6b95684e3c14026d356cb025461393ebc524b90a..56e43d5a3967362caee9ec4133779bf53674850f 100644 (file)
 #define ELLIPSIS_CHARACTER "\xe2\x80\xa6"
 
 static void
-append_n_lines (GString *str, const gchar *text, GSList *lines, gint n_lines)
+append_n_lines (GString *str, const gchar *text, GSList *lines, int n_lines)
 {
   PangoLayoutLine *line;
-  gint i;
+  int i;
 
   for (i = 0; i < n_lines; i++)
     {
@@ -63,7 +63,7 @@ limit_layout_lines (PangoLayout *layout)
   const gchar *text;
   GString     *str;
   GSList      *lines, *elem;
-  gint         n_lines;
+  int          n_lines;
 
   n_lines = pango_layout_get_line_count (layout);
   
@@ -110,7 +110,7 @@ gtk_text_util_create_drag_icon (GtkWidget *widget,
   PangoContext *context;
   PangoLayout  *layout;
   GdkPaintable *paintable;
-  gint          layout_width;
+  int           layout_width;
   const GdkRGBA *color;
 
   g_return_val_if_fail (widget != NULL, NULL);
@@ -166,7 +166,7 @@ set_attributes_from_style (GtkWidget         *widget,
   values->font = gtk_css_style_get_pango_font (style);
 }
 
-static gint
+static int
 get_border_window_size (GtkTextView       *text_view,
                         GtkTextWindowType  window_type)
 {
@@ -188,7 +188,7 @@ gtk_text_util_create_rich_drag_icon (GtkWidget     *widget,
   GtkAllocation      allocation;
   GdkPaintable      *paintable;
   GtkSnapshot       *snapshot;
-  gint               layout_width, layout_height;
+  int                layout_width, layout_height;
   GtkTextBuffer     *new_buffer;
   GtkTextLayout     *layout;
   GtkTextAttributes *style;
@@ -261,10 +261,10 @@ gtk_text_util_create_rich_drag_icon (GtkWidget     *widget,
   return paintable;
 }
 
-static gint
+static int
 layout_get_char_width (PangoLayout *layout)
 {
-  gint width;
+  int width;
   PangoFontMetrics *metrics;
   const PangoFontDescription *font_desc;
   PangoContext *context = pango_layout_get_context (layout);
@@ -293,14 +293,14 @@ layout_get_char_width (PangoLayout *layout)
  */
 gboolean
 _gtk_text_util_get_block_cursor_location (PangoLayout    *layout,
-                                         gint            index,
+                                         int             index,
                                          PangoRectangle *pos,
                                          gboolean       *at_line_end)
 {
   PangoRectangle strong_pos, weak_pos;
   PangoLayoutLine *layout_line;
   gboolean rtl;
-  gint line_no;
+  int line_no;
   const gchar *text;
 
   g_return_val_if_fail (layout != NULL, FALSE);
@@ -363,8 +363,8 @@ _gtk_text_util_get_block_cursor_location (PangoLayout    *layout,
        {
          PangoLayoutIter *iter;
          PangoRectangle line_rect;
-         gint i;
-         gint left, right;
+         int i;
+         int left, right;
          const gchar *p;
 
          p = g_utf8_prev_char (text + index);
index 472faf854f9fd1b3d933a70de538c71691ae7d22..7e95af3a3f5c430a1d9bcbb7d2bbb27f555b36d8 100644 (file)
@@ -42,7 +42,7 @@ GdkPaintable *    gtk_text_util_create_rich_drag_icon (GtkWidget     *widget,
                                                    GtkTextIter   *end);
 
 gboolean _gtk_text_util_get_block_cursor_location (PangoLayout    *layout,
-                                                  gint            index_,
+                                                  int             index_,
                                                   PangoRectangle *rectangle,
                                                   gboolean       *at_line_end);
 
index 1f899176e26b6a268bddce9db0386bbff510c011..4e1e1955bdf1c38b4ff6d2825889f8d6f48f428b 100644 (file)
@@ -163,8 +163,8 @@ struct _GtkTextViewPrivate
   guint im_spot_idle;
   gchar *im_module;
 
-  gint dnd_x;
-  gint dnd_y;
+  int dnd_x;
+  int dnd_y;
 
   GtkTextHandle *text_handles[TEXT_HANDLE_N_HANDLES];
   GtkWidget *selection_bubble;
@@ -190,16 +190,16 @@ struct _GtkTextViewPrivate
   /* X offset between widget coordinates and buffer coordinates
    * taking left_padding in account
    */
-  gint xoffset;
+  int xoffset;
 
   /* Y offset between widget coordinates and buffer coordinates
    * taking top_padding and top_margin in account
    */
-  gint yoffset;
+  int yoffset;
 
   /* Width and height of the buffer */
-  gint width;
-  gint height;
+  int width;
+  int height;
 
   /* The virtual cursor position is normally the same as the
    * actual (strong) cursor position, except in two circumstances:
@@ -210,11 +210,11 @@ struct _GtkTextViewPrivate
    * In case a), virtual_cursor_x is preserved, but not virtual_cursor_y
    * In case b), both virtual_cursor_x and virtual_cursor_y are preserved.
    */
-  gint virtual_cursor_x;   /* -1 means use actual cursor position */
-  gint virtual_cursor_y;   /* -1 means use actual cursor position */
+  int virtual_cursor_x;   /* -1 means use actual cursor position */
+  int virtual_cursor_y;   /* -1 means use actual cursor position */
 
   GtkTextMark *first_para_mark; /* Mark at the beginning of the first onscreen paragraph */
-  gint first_para_pixels;       /* Offset of top of screen in the first onscreen paragraph */
+  int first_para_pixels;       /* Offset of top of screen in the first onscreen paragraph */
 
   guint64 blink_start_time;
   guint blink_tick;
@@ -241,22 +241,22 @@ struct _GtkTextViewPrivate
   GdkDrag *drag;
 
   /* Default style settings */
-  gint pixels_above_lines;
-  gint pixels_below_lines;
-  gint pixels_inside_wrap;
+  int pixels_above_lines;
+  int pixels_below_lines;
+  int pixels_inside_wrap;
   GtkWrapMode wrap_mode;
   GtkJustification justify;
 
-  gint left_margin;
-  gint right_margin;
-  gint top_margin;
-  gint bottom_margin;
-  gint left_padding;
-  gint right_padding;
-  gint top_padding;
-  gint bottom_padding;
+  int left_margin;
+  int right_margin;
+  int top_margin;
+  int bottom_margin;
+  int left_padding;
+  int right_padding;
+  int top_padding;
+  int bottom_padding;
 
-  gint indent;
+  int indent;
   gint64 handle_place_time;
   PangoTabArray *tabs;
   guint editable : 1;
@@ -391,7 +391,7 @@ static void gtk_text_view_state_flags_changed  (GtkWidget        *widget,
                                                GtkStateFlags     previous_state);
 
 static void gtk_text_view_click_gesture_pressed (GtkGestureClick *gesture,
-                                                      gint                  n_press,
+                                                      int                   n_press,
                                                       gdouble               x,
                                                       gdouble               y,
                                                       GtkTextView          *text_view);
@@ -445,23 +445,23 @@ static void gtk_text_view_popup_menu        (GtkWidget  *widget,
                                              GVariant   *parameters);
 static void gtk_text_view_move_cursor       (GtkTextView           *text_view,
                                              GtkMovementStep        step,
-                                             gint                   count,
+                                             int                    count,
                                              gboolean               extend_selection);
 static void gtk_text_view_move_viewport     (GtkTextView           *text_view,
                                              GtkScrollStep          step,
-                                             gint                   count);
+                                             int                    count);
 static void gtk_text_view_set_anchor       (GtkTextView           *text_view);
 static gboolean gtk_text_view_scroll_pages (GtkTextView           *text_view,
-                                            gint                   count,
+                                            int                    count,
                                             gboolean               extend_selection);
 static gboolean gtk_text_view_scroll_hpages(GtkTextView           *text_view,
-                                            gint                   count,
+                                            int                    count,
                                             gboolean               extend_selection);
 static void gtk_text_view_insert_at_cursor (GtkTextView           *text_view,
                                             const gchar           *str);
 static void gtk_text_view_delete_from_cursor (GtkTextView           *text_view,
                                               GtkDeleteType          type,
-                                              gint                   count);
+                                              int                    count);
 static void gtk_text_view_backspace        (GtkTextView           *text_view);
 static void gtk_text_view_cut_clipboard    (GtkTextView           *text_view);
 static void gtk_text_view_copy_clipboard   (GtkTextView           *text_view);
@@ -488,8 +488,8 @@ static gboolean gtk_text_view_end_selection_drag     (GtkTextView        *text_v
 static void     gtk_text_view_start_selection_dnd    (GtkTextView        *text_view,
                                                       const GtkTextIter  *iter,
                                                       GdkEvent           *event,
-                                                      gint                x,
-                                                      gint                y);
+                                                      int                 x,
+                                                      int                 y);
 static void     gtk_text_view_check_cursor_blink     (GtkTextView        *text_view);
 static void     gtk_text_view_pend_cursor_blink      (GtkTextView        *text_view);
 static void     gtk_text_view_stop_cursor_blink      (GtkTextView        *text_view);
@@ -507,8 +507,8 @@ static void     gtk_text_view_preedit_changed_handler      (GtkIMContext  *conte
 static gboolean gtk_text_view_retrieve_surrounding_handler (GtkIMContext  *context,
                                                            GtkTextView   *text_view);
 static gboolean gtk_text_view_delete_surrounding_handler   (GtkIMContext  *context,
-                                                           gint           offset,
-                                                           gint           n_chars,
+                                                           int            offset,
+                                                           int            n_chars,
                                                            GtkTextView   *text_view);
 
 static void gtk_text_view_mark_set_handler       (GtkTextBuffer     *buffer,
@@ -528,11 +528,11 @@ static void gtk_text_view_buffer_notify_undo     (GtkTextBuffer     *buffer,
                                                   GtkTextView       *view);
 static void gtk_text_view_get_virtual_cursor_pos (GtkTextView       *text_view,
                                                   GtkTextIter       *cursor,
-                                                  gint              *x,
-                                                  gint              *y);
+                                                  int               *x,
+                                                  int               *y);
 static void gtk_text_view_set_virtual_cursor_pos (GtkTextView       *text_view,
-                                                  gint               x,
-                                                  gint               y);
+                                                  int                x,
+                                                  int                y);
 
 static void gtk_text_view_do_popup               (GtkTextView       *text_view,
                                                  GdkEvent          *event);
@@ -566,8 +566,8 @@ static void update_node_ordering (GtkWidget    *widget);
 static void gtk_text_view_handle_drag_started  (GtkTextHandle         *handle,
                                                 GtkTextView           *text_view);
 static void gtk_text_view_handle_dragged       (GtkTextHandle         *handle,
-                                                gint                   x,
-                                                gint                   y,
+                                                int                    x,
+                                                int                    y,
                                                 GtkTextView           *text_view);
 static void gtk_text_view_handle_drag_finished (GtkTextHandle         *handle,
                                                 GtkTextView           *text_view);
@@ -646,8 +646,8 @@ static GtkTextWindow *text_window_new             (GtkWidget         *widget);
 static void           text_window_free            (GtkTextWindow     *win);
 static void           text_window_size_allocate   (GtkTextWindow     *win,
                                                    GdkRectangle      *rect);
-static gint           text_window_get_width       (GtkTextWindow     *win);
-static gint           text_window_get_height      (GtkTextWindow     *win);
+static int            text_window_get_width       (GtkTextWindow     *win);
+static int            text_window_get_height      (GtkTextWindow     *win);
 
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -773,7 +773,7 @@ add_move_binding (GtkWidgetClass *widget_class,
                   guint           keyval,
                   guint           modmask,
                   GtkMovementStep step,
-                  gint            count)
+                  int             count)
 {
   g_assert ((modmask & GDK_SHIFT_MASK) == 0);
 
@@ -2251,8 +2251,8 @@ gtk_text_view_get_cursor_locations (GtkTextView       *text_view,
 gboolean
 gtk_text_view_get_iter_at_location (GtkTextView *text_view,
                                     GtkTextIter *iter,
-                                    gint         x,
-                                    gint         y)
+                                    int          x,
+                                    int          y)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
   g_return_val_if_fail (iter != NULL, FALSE);
@@ -2289,9 +2289,9 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view,
 gboolean
 gtk_text_view_get_iter_at_position (GtkTextView *text_view,
                                     GtkTextIter *iter,
-                                    gint        *trailing,
-                                    gint         x,
-                                    gint         y)
+                                    int         *trailing,
+                                    int          x,
+                                    int          y)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
   g_return_val_if_fail (iter != NULL, FALSE);
@@ -2339,8 +2339,8 @@ gtk_text_view_get_iter_location (GtkTextView       *text_view,
 void
 gtk_text_view_get_line_yrange (GtkTextView       *text_view,
                                const GtkTextIter *iter,
-                               gint              *y,
-                               gint              *height)
+                               int               *y,
+                               int               *height)
 {
   g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
   g_return_if_fail (gtk_text_iter_get_buffer (iter) == get_buffer (text_view));
@@ -2369,8 +2369,8 @@ gtk_text_view_get_line_yrange (GtkTextView       *text_view,
 void
 gtk_text_view_get_line_at_y (GtkTextView *text_view,
                              GtkTextIter *target_iter,
-                             gint         y,
-                             gint        *line_top)
+                             int          y,
+                             int         *line_top)
 {
   g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
 
@@ -2402,24 +2402,24 @@ _gtk_text_view_scroll_to_iter (GtkTextView   *text_view,
   GtkWidget *widget;
 
   GdkRectangle cursor;
-  gint cursor_bottom;
-  gint cursor_right;
+  int cursor_bottom;
+  int cursor_right;
 
   GdkRectangle screen;
   GdkRectangle screen_dest;
 
-  gint screen_inner_left;
-  gint screen_inner_right;
-  gint screen_inner_top;
-  gint screen_inner_bottom;
+  int screen_inner_left;
+  int screen_inner_right;
+  int screen_inner_top;
+  int screen_inner_bottom;
 
-  gint border_xoffset = 0;
-  gint border_yoffset = 0;
-  gint within_margin_xoffset;
-  gint within_margin_yoffset;
+  int border_xoffset = 0;
+  int border_yoffset = 0;
+  int within_margin_xoffset;
+  int within_margin_yoffset;
 
-  gint buffer_bottom;
-  gint buffer_right;
+  int buffer_bottom;
+  int buffer_right;
 
   gboolean retval = FALSE;
 
@@ -2519,7 +2519,7 @@ _gtk_text_view_scroll_to_iter (GtkTextView   *text_view,
   /* Vertical scroll */
   if (use_align)
     {
-      gint cursor_y_alignment_offset;
+      int cursor_y_alignment_offset;
 
       cursor_y_alignment_offset = (cursor.height * yalign) - (screen_dest.height * yalign);
       screen_dest.y = cursor.y + cursor_y_alignment_offset - within_margin_yoffset;
@@ -2557,7 +2557,7 @@ _gtk_text_view_scroll_to_iter (GtkTextView   *text_view,
 
   if (use_align)
     {
-      gint cursor_x_alignment_offset;
+      int cursor_x_alignment_offset;
 
       cursor_x_alignment_offset = (cursor.width * xalign) - (screen_dest.width * xalign);
       screen_dest.x = cursor.x + cursor_x_alignment_offset - within_margin_xoffset;
@@ -2759,7 +2759,7 @@ static void
 gtk_text_view_update_adjustments (GtkTextView *text_view)
 {
   GtkTextViewPrivate *priv;
-  gint width = 0, height = 0;
+  int width = 0, height = 0;
 
   DV(g_print(">Updating adjustments ("G_STRLOC")\n"));
 
@@ -3131,7 +3131,7 @@ gtk_text_view_get_editable (GtkTextView *text_view)
  **/
 void
 gtk_text_view_set_pixels_above_lines (GtkTextView *text_view,
-                                      gint         pixels_above_lines)
+                                      int          pixels_above_lines)
 {
   GtkTextViewPrivate *priv;
 
@@ -3163,7 +3163,7 @@ gtk_text_view_set_pixels_above_lines (GtkTextView *text_view,
  * 
  * Returns: default number of pixels above paragraphs
  **/
-gint
+int
 gtk_text_view_get_pixels_above_lines (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3182,7 +3182,7 @@ gtk_text_view_get_pixels_above_lines (GtkTextView *text_view)
  **/
 void
 gtk_text_view_set_pixels_below_lines (GtkTextView *text_view,
-                                      gint         pixels_below_lines)
+                                      int          pixels_below_lines)
 {
   GtkTextViewPrivate *priv;
 
@@ -3215,7 +3215,7 @@ gtk_text_view_set_pixels_below_lines (GtkTextView *text_view,
  *
  * Returns: default number of blank pixels below paragraphs
  **/
-gint
+int
 gtk_text_view_get_pixels_below_lines (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3234,7 +3234,7 @@ gtk_text_view_get_pixels_below_lines (GtkTextView *text_view)
  **/
 void
 gtk_text_view_set_pixels_inside_wrap (GtkTextView *text_view,
-                                      gint         pixels_inside_wrap)
+                                      int          pixels_inside_wrap)
 {
   GtkTextViewPrivate *priv;
 
@@ -3264,7 +3264,7 @@ gtk_text_view_set_pixels_inside_wrap (GtkTextView *text_view,
  * 
  * Returns: default number of pixels of blank space between wrapped lines
  **/
-gint
+int
 gtk_text_view_get_pixels_inside_wrap (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3335,7 +3335,7 @@ gtk_text_view_get_justification (GtkTextView *text_view)
  */
 void
 gtk_text_view_set_left_margin (GtkTextView *text_view,
-                               gint         left_margin)
+                               int          left_margin)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -3365,7 +3365,7 @@ gtk_text_view_set_left_margin (GtkTextView *text_view,
  *
  * Returns: left margin in pixels
  */
-gint
+int
 gtk_text_view_get_left_margin (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3386,7 +3386,7 @@ gtk_text_view_get_left_margin (GtkTextView *text_view)
  */
 void
 gtk_text_view_set_right_margin (GtkTextView *text_view,
-                                gint         right_margin)
+                                int          right_margin)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -3416,7 +3416,7 @@ gtk_text_view_set_right_margin (GtkTextView *text_view,
  *
  * Returns: right margin in pixels
  */
-gint
+int
 gtk_text_view_get_right_margin (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3436,7 +3436,7 @@ gtk_text_view_get_right_margin (GtkTextView *text_view)
  */
 void
 gtk_text_view_set_top_margin (GtkTextView *text_view,
-                              gint         top_margin)
+                              int          top_margin)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -3466,7 +3466,7 @@ gtk_text_view_set_top_margin (GtkTextView *text_view,
  *
  * Returns: top margin in pixels
  **/
-gint
+int
 gtk_text_view_get_top_margin (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3486,7 +3486,7 @@ gtk_text_view_get_top_margin (GtkTextView *text_view)
  */
 void
 gtk_text_view_set_bottom_margin (GtkTextView *text_view,
-                                 gint         bottom_margin)
+                                 int          bottom_margin)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -3512,7 +3512,7 @@ gtk_text_view_set_bottom_margin (GtkTextView *text_view,
  *
  * Returns: bottom margin in pixels
  */
-gint
+int
 gtk_text_view_get_bottom_margin (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -3530,7 +3530,7 @@ gtk_text_view_get_bottom_margin (GtkTextView *text_view)
  **/
 void
 gtk_text_view_set_indent (GtkTextView *text_view,
-                          gint         indent)
+                          int          indent)
 {
   GtkTextViewPrivate *priv;
 
@@ -3562,7 +3562,7 @@ gtk_text_view_set_indent (GtkTextView *text_view,
  * 
  * Returns: number of pixels of indentation
  **/
-gint
+int
 gtk_text_view_get_indent (GtkTextView *text_view)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
@@ -4193,7 +4193,7 @@ gtk_text_view_compute_child_allocation (GtkTextView         *text_view,
                                         const AnchoredChild *vc,
                                         GtkAllocation       *allocation)
 {
-  gint buffer_y;
+  int buffer_y;
   GtkTextIter iter;
   GtkRequisition req;
   
@@ -4236,8 +4236,8 @@ gtk_text_view_update_child_allocation (GtkTextView         *text_view,
 static void
 gtk_anchored_child_allocated (GtkTextLayout *layout,
                               GtkWidget     *child,
-                              gint           x,
-                              gint           y,
+                              int            x,
+                              int            y,
                               gpointer       data)
 {
   AnchoredChild *vc = NULL;
@@ -4412,7 +4412,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
 {
   GtkTextView *text_view;
   GtkTextViewPrivate *priv;
-  gint width, height;
+  int width, height;
   GdkRectangle text_rect;
   GdkRectangle left_rect;
   GdkRectangle right_rect;
@@ -4718,9 +4718,9 @@ invalidated_handler (GtkTextLayout *layout,
 
 static void
 changed_handler (GtkTextLayout     *layout,
-                 gint               start_y,
-                 gint               old_height,
-                 gint               new_height,
+                 int                start_y,
+                 int                old_height,
+                 int                new_height,
                  gpointer           data)
 {
   GtkTextView *text_view;
@@ -4950,8 +4950,8 @@ gtk_text_view_unobscure_mouse_cursor (GtkTextView *text_view)
 
 static void
 _text_window_to_widget_coords (GtkTextView *text_view,
-                               gint        *x,
-                               gint        *y)
+                               int         *x,
+                               int         *y)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -4961,8 +4961,8 @@ _text_window_to_widget_coords (GtkTextView *text_view,
 
 static void
 _widget_to_text_surface_coords (GtkTextView *text_view,
-                               gint        *x,
-                               gint        *y)
+                               int         *x,
+                               int         *y)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -4977,7 +4977,7 @@ gtk_text_view_set_handle_position (GtkTextView   *text_view,
 {
   GtkTextViewPrivate *priv;
   GdkRectangle rect;
-  gint x, y;
+  int x, y;
 
   priv = text_view->priv;
   gtk_text_view_get_cursor_locations (text_view, iter, &rect, NULL);
@@ -5017,8 +5017,8 @@ gtk_text_view_set_handle_position (GtkTextView   *text_view,
 static void
 gtk_text_view_show_magnifier (GtkTextView *text_view,
                               GtkTextIter *iter,
-                              gint         x,
-                              gint         y)
+                              int          x,
+                              int          y)
 {
   cairo_rectangle_int_t rect;
   GtkTextViewPrivate *priv;
@@ -5060,8 +5060,8 @@ gtk_text_view_show_magnifier (GtkTextView *text_view,
 
 static void
 gtk_text_view_handle_dragged (GtkTextHandle *handle,
-                              gint           x,
-                              gint           y,
+                              int            x,
+                              int            y,
                               GtkTextView   *text_view)
 {
   GtkTextViewPrivate *priv;
@@ -5334,12 +5334,12 @@ static gboolean
 get_iter_from_gesture (GtkTextView *text_view,
                        GtkGesture  *gesture,
                        GtkTextIter *iter,
-                       gint        *x,
-                       gint        *y)
+                       int         *x,
+                       int         *y)
 {
   GdkEventSequence *sequence;
   GtkTextViewPrivate *priv;
-  gint xcoord, ycoord;
+  int xcoord, ycoord;
   gdouble px, py;
 
   priv = text_view->priv;
@@ -5364,7 +5364,7 @@ get_iter_from_gesture (GtkTextView *text_view,
 
 static void
 gtk_text_view_click_gesture_pressed (GtkGestureClick *gesture,
-                                     gint             n_press,
+                                     int              n_press,
                                      gdouble          x,
                                      gdouble          y,
                                      GtkTextView     *text_view)
@@ -5851,22 +5851,22 @@ get_middle_click_paste (GtkTextView *text_view)
   return paste;
 }
 
-static gint
+static int
 get_cursor_time (GtkTextView *text_view)
 {
   GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
-  gint time;
+  int time;
 
   g_object_get (settings, "gtk-cursor-blink-time", &time, NULL);
 
   return time;
 }
 
-static gint
+static int
 get_cursor_blink_timeout (GtkTextView *text_view)
 {
   GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
-  gint time;
+  int time;
 
   g_object_get (settings, "gtk-cursor-blink-timeout", &time, NULL);
 
@@ -5949,8 +5949,8 @@ blink_cb (GtkWidget     *widget,
   GtkTextView *text_view = GTK_TEXT_VIEW (widget);
   GtkTextViewPrivate *priv = text_view->priv;
   BlinkData *data = user_data;
-  gint blink_timeout;
-  gint blink_time;
+  int blink_timeout;
+  int blink_time;
   guint64 now;
   float phase;
   float  alpha;
@@ -6042,7 +6042,7 @@ gtk_text_view_reset_blink_time (GtkTextView *text_view)
 static gboolean
 gtk_text_view_move_iter_by_lines (GtkTextView *text_view,
                                   GtkTextIter *newplace,
-                                  gint         count)
+                                  int          count)
 {
   gboolean ret = TRUE;
 
@@ -6097,14 +6097,14 @@ iter_line_is_rtl (const GtkTextIter *iter)
 static void
 gtk_text_view_move_cursor (GtkTextView     *text_view,
                            GtkMovementStep  step,
-                           gint             count,
+                           int              count,
                            gboolean         extend_selection)
 {
   GtkTextViewPrivate *priv;
   GtkTextIter insert;
   GtkTextIter newplace;
   gboolean cancel_selection = FALSE;
-  gint cursor_x_pos = 0;
+  int cursor_x_pos = 0;
   GtkDirectionType leave_direction = -1;
 
   priv = text_view->priv;
@@ -6356,7 +6356,7 @@ gtk_text_view_move_cursor (GtkTextView     *text_view,
 static void
 gtk_text_view_move_viewport (GtkTextView     *text_view,
                              GtkScrollStep    step,
-                             gint             count)
+                             int              count)
 {
   GtkAdjustment *adjustment;
   gdouble increment;
@@ -6413,19 +6413,19 @@ gtk_text_view_set_anchor (GtkTextView *text_view)
 
 static gboolean
 gtk_text_view_scroll_pages (GtkTextView *text_view,
-                            gint         count,
+                            int          count,
                             gboolean     extend_selection)
 {
   GtkTextViewPrivate *priv;
   GtkAdjustment *adjustment;
-  gint cursor_x_pos, cursor_y_pos;
+  int cursor_x_pos, cursor_y_pos;
   GtkTextMark *insert_mark;
   GtkTextIter old_insert;
   GtkTextIter new_insert;
   GtkTextIter anchor;
   gdouble newval;
   gdouble oldval;
-  gint y0, y1;
+  int y0, y1;
 
   priv = text_view->priv;
 
@@ -6506,18 +6506,18 @@ gtk_text_view_scroll_pages (GtkTextView *text_view,
 
 static gboolean
 gtk_text_view_scroll_hpages (GtkTextView *text_view,
-                             gint         count,
+                             int          count,
                              gboolean     extend_selection)
 {
   GtkTextViewPrivate *priv;
   GtkAdjustment *adjustment;
-  gint cursor_x_pos, cursor_y_pos;
+  int cursor_x_pos, cursor_y_pos;
   GtkTextMark *insert_mark;
   GtkTextIter old_insert;
   GtkTextIter new_insert;
   gdouble newval;
   gdouble oldval;
-  gint y, height;
+  int y, height;
 
   priv = text_view->priv;
 
@@ -6631,7 +6631,7 @@ gtk_text_view_insert_at_cursor (GtkTextView *text_view,
 static void
 gtk_text_view_delete_from_cursor (GtkTextView   *text_view,
                                   GtkDeleteType  type,
-                                  gint           count)
+                                  int            count)
 {
   GtkTextViewPrivate *priv;
   GtkTextIter insert;
@@ -7182,10 +7182,10 @@ selection_data_free (SelectionData *data)
 static gboolean
 drag_gesture_get_text_surface_coords (GtkGestureDrag *gesture,
                                      GtkTextView    *text_view,
-                                     gint           *start_x,
-                                     gint           *start_y,
-                                     gint           *x,
-                                     gint           *y)
+                                     int            *start_x,
+                                     int            *start_y,
+                                     int            *x,
+                                     int            *y)
 {
   gdouble sx, sy, ox, oy;
 
@@ -7210,7 +7210,7 @@ gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture,
                                    gdouble         offset_y,
                                    GtkTextView    *text_view)
 {
-  gint start_x, start_y, x, y;
+  int start_x, start_y, x, y;
   GdkEventSequence *sequence;
   gboolean is_touchscreen;
   GdkEvent *event;
@@ -7243,7 +7243,7 @@ gtk_text_view_drag_gesture_update (GtkGestureDrag *gesture,
           if (!is_touchscreen)
             {
               GtkTextIter iter;
-              gint buffer_x, buffer_y;
+              int buffer_x, buffer_y;
 
               gtk_text_view_window_to_buffer_coords (text_view,
                                                      GTK_TEXT_WINDOW_TEXT,
@@ -7329,7 +7329,7 @@ gtk_text_view_drag_gesture_end (GtkGestureDrag *gesture,
                                 GtkTextView    *text_view)
 {
   gboolean is_touchscreen, clicked_in_selection;
-  gint start_x, start_y, x, y;
+  int start_x, start_y, x, y;
   GdkEventSequence *sequence;
   GtkTextViewPrivate *priv;
   GdkEvent *event;
@@ -7780,8 +7780,8 @@ static void
 gtk_text_view_start_selection_dnd (GtkTextView       *text_view,
                                    const GtkTextIter *iter,
                                    GdkEvent          *event,
-                                   gint               x,
-                                   gint               y)
+                                   int                x,
+                                   int                y)
 {
   GtkWidget *widget = GTK_WIDGET (text_view);
   GtkTextBuffer *buffer = gtk_text_view_get_buffer (text_view);
@@ -7838,7 +7838,7 @@ gtk_text_view_drag_motion (GtkDropTarget *dest,
   GtkTextIter newplace;
   GtkTextIter start;
   GtkTextIter end;
-  gint bx, by;
+  int bx, by;
   gboolean can_accept = FALSE;
 
   gtk_text_view_window_to_buffer_coords (text_view,
@@ -7969,7 +7969,7 @@ static void
 gtk_text_view_set_hadjustment_values (GtkTextView *text_view)
 {
   GtkTextViewPrivate *priv;
-  gint screen_width;
+  int screen_width;
   gdouble old_value;
   gdouble new_value;
   gdouble new_upper;
@@ -7998,8 +7998,8 @@ gtk_text_view_set_vadjustment_values (GtkTextView *text_view)
 {
   GtkTextViewPrivate *priv;
   GtkTextIter first_para;
-  gint screen_height;
-  gint y;
+  int screen_height;
+  int y;
   gdouble old_value;
   gdouble new_value;
   gdouble new_upper;
@@ -8037,9 +8037,9 @@ gtk_text_view_value_changed (GtkAdjustment *adjustment,
 {
   GtkTextViewPrivate *priv;
   GtkTextIter iter;
-  gint line_top;
-  gint dx = 0;
-  gint dy = 0;
+  int line_top;
+  int dx = 0;
+  int dy = 0;
 
   priv = text_view->priv;
 
@@ -8055,12 +8055,12 @@ gtk_text_view_value_changed (GtkAdjustment *adjustment,
   
   if (adjustment == priv->hadjustment)
     {
-      dx = priv->xoffset - (gint)gtk_adjustment_get_value (adjustment);
-      priv->xoffset = (gint)gtk_adjustment_get_value (adjustment) - priv->left_padding;
+      dx = priv->xoffset - (int)gtk_adjustment_get_value (adjustment);
+      priv->xoffset = (int)gtk_adjustment_get_value (adjustment) - priv->left_padding;
     }
   else if (adjustment == priv->vadjustment)
     {
-      dy = priv->yoffset - (gint)gtk_adjustment_get_value (adjustment) + priv->top_margin ;
+      dy = priv->yoffset - (int)gtk_adjustment_get_value (adjustment) + priv->top_margin ;
       priv->yoffset -= dy;
 
       if (priv->layout)
@@ -8206,7 +8206,7 @@ gtk_text_view_preedit_changed_handler (GtkIMContext *context,
   GtkTextViewPrivate *priv;
   gchar *str;
   PangoAttrList *attrs;
-  gint cursor_pos;
+  int cursor_pos;
   GtkTextIter iter;
 
   priv = text_view->priv;
@@ -8246,7 +8246,7 @@ gtk_text_view_retrieve_surrounding_handler (GtkIMContext  *context,
 {
   GtkTextIter start;
   GtkTextIter end;
-  gint pos;
+  int pos;
   gchar *text;
 
   gtk_text_buffer_get_iter_at_mark (text_view->priv->buffer, &start,
@@ -8266,8 +8266,8 @@ gtk_text_view_retrieve_surrounding_handler (GtkIMContext  *context,
 
 static gboolean
 gtk_text_view_delete_surrounding_handler (GtkIMContext  *context,
-                                         gint           offset,
-                                         gint           n_chars,
+                                         int            offset,
+                                         int            n_chars,
                                          GtkTextView   *text_view)
 {
   GtkTextViewPrivate *priv;
@@ -8324,8 +8324,8 @@ gtk_text_view_mark_set_handler (GtkTextBuffer     *buffer,
 static void
 gtk_text_view_get_virtual_cursor_pos (GtkTextView *text_view,
                                       GtkTextIter *cursor,
-                                      gint        *x,
-                                      gint        *y)
+                                      int         *x,
+                                      int         *y)
 {
   GtkTextViewPrivate *priv;
   GtkTextIter insert;
@@ -8362,8 +8362,8 @@ gtk_text_view_get_virtual_cursor_pos (GtkTextView *text_view,
 
 static void
 gtk_text_view_set_virtual_cursor_pos (GtkTextView *text_view,
-                                      gint         x,
-                                      gint         y)
+                                      int          x,
+                                      int          y)
 {
   GdkRectangle pos;
 
@@ -8695,7 +8695,7 @@ gtk_text_view_get_selection_rect (GtkTextView           *text_view,
   cairo_rectangle_int_t rect_cursor, rect_bound;
   GtkTextIter cursor, bound;
   GtkTextBuffer *buffer;
-  gint x1, y1, x2, y2;
+  int x1, y1, x2, y2;
 
   buffer = get_buffer (text_view);
   gtk_text_buffer_get_iter_at_mark (buffer, &cursor,
@@ -8982,13 +8982,13 @@ text_window_size_allocate (GtkTextWindow *win,
   win->allocation = *rect;
 }
 
-static gint
+static int
 text_window_get_width (GtkTextWindow *win)
 {
   return win->allocation.width;
 }
 
-static gint
+static int
 text_window_get_height (GtkTextWindow *win)
 {
   return win->allocation.height;
@@ -9014,10 +9014,10 @@ text_window_get_height (GtkTextWindow *win)
 void
 gtk_text_view_buffer_to_window_coords (GtkTextView      *text_view,
                                        GtkTextWindowType win,
-                                       gint              buffer_x,
-                                       gint              buffer_y,
-                                       gint             *window_x,
-                                       gint             *window_y)
+                                       int               buffer_x,
+                                       int               buffer_y,
+                                       int              *window_x,
+                                       int              *window_y)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -9081,10 +9081,10 @@ gtk_text_view_buffer_to_window_coords (GtkTextView      *text_view,
 void
 gtk_text_view_window_to_buffer_coords (GtkTextView      *text_view,
                                        GtkTextWindowType win,
-                                       gint              window_x,
-                                       gint              window_y,
-                                       gint             *buffer_x,
-                                       gint             *buffer_y)
+                                       int               window_x,
+                                       int               window_y,
+                                       int              *buffer_x,
+                                       int              *buffer_y)
 {
   GtkTextViewPrivate *priv = text_view->priv;
 
@@ -9248,8 +9248,8 @@ ensure_child (GtkTextView        *text_view,
 void
 gtk_text_view_add_overlay (GtkTextView *text_view,
                            GtkWidget   *child,
-                           gint         xpos,
-                           gint         ypos)
+                           int          xpos,
+                           int          ypos)
 {
   g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
   g_return_if_fail (GTK_IS_WIDGET (child));
@@ -9275,8 +9275,8 @@ gtk_text_view_add_overlay (GtkTextView *text_view,
 void
 gtk_text_view_move_overlay (GtkTextView *text_view,
                             GtkWidget   *child,
-                            gint         xpos,
-                            gint         ypos)
+                            int          xpos,
+                            int          ypos)
 {
   g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
   g_return_if_fail (GTK_IS_WIDGET (child));
@@ -9449,7 +9449,7 @@ gtk_text_view_starts_display_line (GtkTextView       *text_view,
 gboolean
 gtk_text_view_move_visually (GtkTextView *text_view,
                              GtkTextIter *iter,
-                             gint         count)
+                             int          count)
 {
   g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
   g_return_val_if_fail (iter != NULL, FALSE);
index 7260d4efabdbaa6542ef21de4ff8d8cbd04a2730..c1b282a4aefc6a2729cc23ff28264a7a95ae3c26 100644 (file)
@@ -156,14 +156,14 @@ struct _GtkTextViewClass
 
   void (* move_cursor)           (GtkTextView      *text_view,
                                   GtkMovementStep   step,
-                                  gint              count,
+                                  int               count,
                                   gboolean          extend_selection);
   void (* set_anchor)            (GtkTextView      *text_view);
   void (* insert_at_cursor)      (GtkTextView      *text_view,
                                   const gchar      *str);
   void (* delete_from_cursor)    (GtkTextView      *text_view,
                                   GtkDeleteType     type,
-                                  gint              count);
+                                  int               count);
   void (* backspace)             (GtkTextView      *text_view);
   void (* cut_clipboard)         (GtkTextView      *text_view);
   void (* copy_clipboard)        (GtkTextView      *text_view);
@@ -243,40 +243,40 @@ void           gtk_text_view_get_iter_location     (GtkTextView   *text_view,
 GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_view_get_iter_at_location  (GtkTextView   *text_view,
                                                     GtkTextIter   *iter,
-                                                    gint           x,
-                                                    gint           y);
+                                                    int            x,
+                                                    int            y);
 GDK_AVAILABLE_IN_ALL
 gboolean       gtk_text_view_get_iter_at_position  (GtkTextView   *text_view,
                                                     GtkTextIter   *iter,
-                                                   gint          *trailing,
-                                                    gint           x,
-                                                    gint           y);
+                                                   int           *trailing,
+                                                    int            x,
+                                                    int            y);
 GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_line_yrange       (GtkTextView       *text_view,
                                                     const GtkTextIter *iter,
-                                                    gint              *y,
-                                                    gint              *height);
+                                                    int               *y,
+                                                    int               *height);
 
 GDK_AVAILABLE_IN_ALL
 void           gtk_text_view_get_line_at_y         (GtkTextView       *text_view,
                                                     GtkTextIter       *target_iter,
-                                                    gint               y,
-                                                    gint              *line_top);
+                                                    int                y,
+                                                    int               *line_top);
 
 GDK_AVAILABLE_IN_ALL
 void gtk_text_view_buffer_to_window_coords (GtkTextView       *text_view,
                                             GtkTextWindowType  win,
-                                            gint               buffer_x,
-                                            gint               buffer_y,
-                                            gint              *window_x,
-                                            gint              *window_y);
+                                            int                buffer_x,
+                                            int                buffer_y,
+                                            int               *window_x,
+                                            int               *window_y);
 GDK_AVAILABLE_IN_ALL
 void gtk_text_view_window_to_buffer_coords (GtkTextView       *text_view,
                                             GtkTextWindowType  win,
-                                            gint               window_x,
-                                            gint               window_y,
-                                            gint              *buffer_x,
-                                            gint              *buffer_y);
+                                            int                window_x,
+                                            int                window_y,
+                                            int               *buffer_x,
+                                            int               *buffer_y);
 
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_forward_display_line           (GtkTextView       *text_view,
@@ -296,7 +296,7 @@ gboolean gtk_text_view_starts_display_line            (GtkTextView       *text_v
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_text_view_move_visually                  (GtkTextView       *text_view,
                                                        GtkTextIter       *iter,
-                                                       gint               count);
+                                                       int                count);
 
 GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_view_im_context_filter_keypress (GtkTextView    *text_view,
@@ -320,14 +320,14 @@ void       gtk_text_view_add_child_at_anchor (GtkTextView          *text_view,
 GDK_AVAILABLE_IN_ALL
 void       gtk_text_view_add_overlay         (GtkTextView          *text_view,
                                               GtkWidget            *child,
-                                              gint                  xpos,
-                                              gint                  ypos);
+                                              int                   xpos,
+                                              int                   ypos);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_text_view_move_overlay        (GtkTextView          *text_view,
                                               GtkWidget            *child,
-                                              gint                  xpos,
-                                              gint                  ypos);
+                                              int                   xpos,
+                                              int                   ypos);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_text_view_remove              (GtkTextView          *text_view,
@@ -357,19 +357,19 @@ GDK_AVAILABLE_IN_ALL
 gboolean        gtk_text_view_get_accepts_tab        (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_pixels_above_lines (GtkTextView      *text_view,
-                                                       gint              pixels_above_lines);
+                                                       int               pixels_above_lines);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_pixels_above_lines (GtkTextView      *text_view);
+int              gtk_text_view_get_pixels_above_lines (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_pixels_below_lines (GtkTextView      *text_view,
-                                                       gint              pixels_below_lines);
+                                                       int               pixels_below_lines);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_pixels_below_lines (GtkTextView      *text_view);
+int              gtk_text_view_get_pixels_below_lines (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_pixels_inside_wrap (GtkTextView      *text_view,
-                                                       gint              pixels_inside_wrap);
+                                                       int               pixels_inside_wrap);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_pixels_inside_wrap (GtkTextView      *text_view);
+int              gtk_text_view_get_pixels_inside_wrap (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_justification      (GtkTextView      *text_view,
                                                        GtkJustification  justification);
@@ -377,29 +377,29 @@ GDK_AVAILABLE_IN_ALL
 GtkJustification gtk_text_view_get_justification      (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_left_margin        (GtkTextView      *text_view,
-                                                       gint              left_margin);
+                                                       int               left_margin);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_left_margin        (GtkTextView      *text_view);
+int              gtk_text_view_get_left_margin        (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_right_margin       (GtkTextView      *text_view,
-                                                       gint              right_margin);
+                                                       int               right_margin);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_right_margin       (GtkTextView      *text_view);
+int              gtk_text_view_get_right_margin       (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_top_margin         (GtkTextView      *text_view,
-                                                       gint              top_margin);
+                                                       int               top_margin);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_top_margin         (GtkTextView      *text_view);
+int              gtk_text_view_get_top_margin         (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_bottom_margin      (GtkTextView      *text_view,
-                                                       gint              bottom_margin);
+                                                       int               bottom_margin);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_bottom_margin       (GtkTextView      *text_view);
+int              gtk_text_view_get_bottom_margin       (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_indent             (GtkTextView      *text_view,
-                                                       gint              indent);
+                                                       int               indent);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_text_view_get_indent             (GtkTextView      *text_view);
+int              gtk_text_view_get_indent             (GtkTextView      *text_view);
 GDK_AVAILABLE_IN_ALL
 void             gtk_text_view_set_tabs               (GtkTextView      *text_view,
                                                        PangoTabArray    *tabs);
index e29461ff7ac13c38afccbbcac7def39e49ca21f5..d8196d45926bb06bc6c7dab8e7783a04f351a25b 100644 (file)
@@ -418,10 +418,10 @@ gtk_tooltip_window_hide (GtkWidget *widget,
 
 GtkWidget *
 _gtk_widget_find_at_coords (GdkSurface *surface,
-                            gint       surface_x,
-                            gint       surface_y,
-                            gint      *widget_x,
-                            gint      *widget_y)
+                            int        surface_x,
+                            int        surface_y,
+                            int       *widget_x,
+                            int       *widget_y)
 {
   GtkWidget *event_widget;
   GtkWidget *picked_widget;
@@ -450,7 +450,7 @@ _gtk_widget_find_at_coords (GdkSurface *surface,
   return picked_widget;
 }
 
-static gint
+static int
 tooltip_browse_mode_expired (gpointer data)
 {
   GtkTooltip *tooltip;
@@ -531,8 +531,8 @@ gtk_tooltip_set_surface (GtkTooltip *tooltip,
 static gboolean
 gtk_tooltip_run_requery (GtkWidget  **widget,
                         GtkTooltip  *tooltip,
-                        gint        *x,
-                        gint        *y)
+                        int         *x,
+                        int         *y)
 {
   gboolean has_tooltip = FALSE;
   gboolean return_value = FALSE;
@@ -699,7 +699,7 @@ static void
 gtk_tooltip_show_tooltip (GdkDisplay *display)
 {
   double px, py;
-  gint x, y;
+  int x, y;
   GdkSurface *surface;
   GtkWidget *tooltip_widget;
   GdkSeat *seat;
@@ -801,7 +801,7 @@ gtk_tooltip_hide_tooltip (GtkTooltip *tooltip)
     gtk_widget_hide (tooltip->window);
 }
 
-static gint
+static int
 tooltip_popup_timeout (gpointer data)
 {
   GdkDisplay *display;
index 8f48433775b17c6f6aad454abc109800209e43e3..e8746daff0ddf90d7ee0704040dd26c0253a917d 100644 (file)
@@ -38,10 +38,10 @@ void _gtk_tooltip_hide                   (GtkWidget          *widget);
 void gtk_tooltip_trigger_tooltip_query   (GtkWidget          *widget);
 
 GtkWidget * _gtk_widget_find_at_coords   (GdkSurface         *surface,
-                                          gint                surface_x,
-                                          gint                surface_y,
-                                          gint               *widget_x,
-                                          gint               *widget_y);
+                                          int                 surface_x,
+                                          int                 surface_y,
+                                          int                *widget_x,
+                                          int                *widget_y);
 
 void gtk_tooltip_maybe_allocate          (GtkNative          *native);
 void gtk_tooltip_unset_surface           (GtkNative          *native);
index 45f5b3f3630d7e3624fd45d0995e2c383410f493..46b69f529edb6792aa5d176cda54ad30fd968462 100644 (file)
@@ -34,7 +34,7 @@ struct _GtkTrashMonitor
   gulong file_monitor_changed_id;
 
   gboolean pending;
-  gint timeout_id;
+  int timeout_id;
 
   guint has_trash : 1;
 };
index 442654c1ad37bdc49f8bafcc005cd37a6bcb6e94..101698db5543c06c133eca14561fabf773bec3b1 100644 (file)
@@ -39,7 +39,7 @@ _gtk_tree_data_list_free (GtkTreeDataList *list,
                          GType           *column_headers)
 {
   GtkTreeDataList *tmp, *next;
-  gint i = 0;
+  int i = 0;
 
   tmp = list;
 
@@ -64,7 +64,7 @@ _gtk_tree_data_list_free (GtkTreeDataList *list,
 gboolean
 _gtk_tree_data_list_check_type (GType type)
 {
-  gint i = 0;
+  int i = 0;
   static const GType type_list[] =
   {
     G_TYPE_BOOLEAN,
@@ -135,7 +135,7 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list,
       g_value_set_uchar (value, (guchar) list->data.v_uchar);
       break;
     case G_TYPE_INT:
-      g_value_set_int (value, (gint) list->data.v_int);
+      g_value_set_int (value, (int) list->data.v_int);
       break;
     case G_TYPE_UINT:
       g_value_set_uint (value, (guint) list->data.v_uint);
@@ -316,17 +316,17 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list,
   return new_list;
 }
 
-gint
+int
 _gtk_tree_data_list_compare_func (GtkTreeModel *model,
                                  GtkTreeIter  *a,
                                  GtkTreeIter  *b,
                                  gpointer      user_data)
 {
-  gint column = GPOINTER_TO_INT (user_data);
+  int column = GPOINTER_TO_INT (user_data);
   GType type = gtk_tree_model_get_column_type (model, column);
   GValue a_value = G_VALUE_INIT;
   GValue b_value = G_VALUE_INIT;
-  gint retval;
+  int retval;
   const gchar *stra, *strb;
 
   gtk_tree_model_get_value (model, a, column, &a_value);
@@ -465,12 +465,12 @@ _gtk_tree_data_list_compare_func (GtkTreeModel *model,
 
 
 GList *
-_gtk_tree_data_list_header_new (gint   n_columns,
+_gtk_tree_data_list_header_new (int    n_columns,
                                GType *types)
 {
   GList *retval = NULL;
 
-  gint i;
+  int i;
 
   for (i = 0; i < n_columns; i ++)
     {
@@ -511,7 +511,7 @@ _gtk_tree_data_list_header_free (GList *list)
 
 GtkTreeDataSortHeader *
 _gtk_tree_data_list_get_header (GList   *header_list,
-                               gint     sort_column_id)
+                               int      sort_column_id)
 {
   GtkTreeDataSortHeader *header = NULL;
 
@@ -527,7 +527,7 @@ _gtk_tree_data_list_get_header (GList   *header_list,
 
 GList *
 _gtk_tree_data_list_set_header (GList                  *header_list,
-                               gint                    sort_column_id,
+                               int                     sort_column_id,
                                GtkTreeIterCompareFunc  func,
                                gpointer                data,
                                GDestroyNotify          destroy)
index 85e56219e469b88e2dc7ee8569f60e1f2505692d..2d88496a6681a6033918d1378413c5cd25de8cf5 100644 (file)
@@ -27,7 +27,7 @@ struct _GtkTreeDataList
   GtkTreeDataList *next;
 
   union {
-    gint          v_int;
+    int           v_int;
     gint8          v_char;
     guint8         v_uchar;
     guint         v_uint;
@@ -43,7 +43,7 @@ struct _GtkTreeDataList
 
 typedef struct _GtkTreeDataSortHeader
 {
-  gint sort_column_id;
+  int sort_column_id;
   GtkTreeIterCompareFunc func;
   gpointer data;
   GDestroyNotify destroy;
@@ -63,17 +63,17 @@ GtkTreeDataList *_gtk_tree_data_list_node_copy      (GtkTreeDataList *list,
                                                      GType            type);
 
 /* Header code */
-gint                   _gtk_tree_data_list_compare_func (GtkTreeModel *model,
+int                    _gtk_tree_data_list_compare_func (GtkTreeModel *model,
                                                         GtkTreeIter  *a,
                                                         GtkTreeIter  *b,
                                                         gpointer      user_data);
-GList *                _gtk_tree_data_list_header_new  (gint          n_columns,
+GList *                _gtk_tree_data_list_header_new  (int           n_columns,
                                                        GType        *types);
 void                   _gtk_tree_data_list_header_free (GList        *header_list);
 GtkTreeDataSortHeader *_gtk_tree_data_list_get_header  (GList        *header_list,
-                                                       gint          sort_column_id);
+                                                       int           sort_column_id);
 GList                 *_gtk_tree_data_list_set_header  (GList                  *header_list,
-                                                       gint                    sort_column_id,
+                                                       int                     sort_column_id,
                                                        GtkTreeIterCompareFunc  func,
                                                        gpointer                data,
                                                        GDestroyNotify          destroy);
index 7d26c188f0a81f31b00d6aeabc3bb3e1be9bfe16..d98c1af6eb5cb46c49f3b36692b3844421a37c25 100644 (file)
@@ -269,8 +269,8 @@ gtk_tree_create_row_drag_content (GtkTreeModel *tree_model,
   GdkContentProvider *content;
   GtkTreeRowData *trd;
   gchar *path_str;
-  gint len;
-  gint struct_size;
+  int len;
+  int struct_size;
   
   g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), FALSE);
   g_return_val_if_fail (path != NULL, FALSE);
index 6a3467474944ed30ec03bcc38bd29d09f4fbedfb..347ef323d155a93596aa851db7b0c153825fe2d8 100644 (file)
  * GtkTreeModel *list_store;
  * GtkTreeIter iter;
  * gboolean valid;
- * gint row_count = 0;
+ * int row_count = 0;
  *
  * // make a new list_store
  * list_store = gtk_list_store_new (N_COLUMNS,
  * while (valid)
  *  {
  *    gchar *str_data;
- *    gint   int_data;
+ *    int    int_data;
  *
  *    // Make sure you terminate calls to gtk_tree_model_get() with a “-1” value
  *    gtk_tree_model_get (list_store, &iter,
@@ -254,9 +254,9 @@ static guint tree_model_signals[LAST_SIGNAL] = { 0 };
 
 struct _GtkTreePath
 {
-  gint depth;    /* Number of elements */
-  gint alloc;    /* Number of allocated elements */
-  gint *indices;
+  int depth;    /* Number of elements */
+  int alloc;    /* Number of allocated elements */
+  int *indices;
 };
 
 typedef struct
@@ -294,7 +294,7 @@ static void      gtk_tree_row_ref_deleted   (RowRefList        *refs,
 static void      gtk_tree_row_ref_reordered (RowRefList        *refs,
                                              GtkTreePath       *path,
                                              GtkTreeIter       *iter,
-                                             gint              *new_order);
+                                             int               *new_order);
 
 GType
 gtk_tree_model_get_type (void)
@@ -569,12 +569,12 @@ rows_reordered_marshal (GClosure          *closure,
   void (* rows_reordered_callback) (GtkTreeModel *tree_model,
                                     GtkTreePath  *path,
                                     GtkTreeIter  *iter,
-                                    gint         *new_order);
+                                    int          *new_order);
 
   GObject *model = g_value_get_object (param_values + 0);
   GtkTreePath *path = (GtkTreePath *)g_value_get_boxed (param_values + 1);
   GtkTreeIter *iter = (GtkTreeIter *)g_value_get_boxed (param_values + 2);
-  gint *new_order = (gint *)g_value_get_pointer (param_values + 3);
+  int *new_order = (int *)g_value_get_pointer (param_values + 3);
 
   /* first, we need to update internal row references */
   gtk_tree_row_ref_reordered ((RowRefList *)g_object_get_data (model, ROW_REF_DATA_STRING),
@@ -631,7 +631,7 @@ gtk_tree_path_new_from_string (const gchar *path)
   GtkTreePath *retval;
   const gchar *orig_path = path;
   gchar *ptr;
-  gint i;
+  int i;
 
   g_return_val_if_fail (path != NULL, NULL);
   g_return_val_if_fail (*path != '\000', NULL);
@@ -674,7 +674,7 @@ gtk_tree_path_new_from_string (const gchar *path)
  * Returns: A newly created #GtkTreePath-struct
  */
 GtkTreePath *
-gtk_tree_path_new_from_indices (gint first_index,
+gtk_tree_path_new_from_indices (int first_index,
                                 ...)
 {
   int arg;
@@ -689,7 +689,7 @@ gtk_tree_path_new_from_indices (gint first_index,
   while (arg != -1)
     {
       gtk_tree_path_append_index (path, arg);
-      arg = va_arg (args, gint);
+      arg = va_arg (args, int);
     }
 
   va_end (args);
@@ -707,7 +707,7 @@ gtk_tree_path_new_from_indices (gint first_index,
  * Returns: A newly created #GtkTreePath-struct
  */
 GtkTreePath *
-gtk_tree_path_new_from_indicesv (gint *indices,
+gtk_tree_path_new_from_indicesv (int *indices,
                                  gsize length)
 {
   GtkTreePath *path;
@@ -717,8 +717,8 @@ gtk_tree_path_new_from_indicesv (gint *indices,
   path = gtk_tree_path_new ();
   path->alloc = length;
   path->depth = length;
-  path->indices = g_new (gint, length);
-  memcpy (path->indices, indices, length * sizeof (gint));
+  path->indices = g_new (int, length);
+  memcpy (path->indices, indices, length * sizeof (int));
 
   return path;
 }
@@ -740,7 +740,7 @@ gchar *
 gtk_tree_path_to_string (GtkTreePath *path)
 {
   gchar *retval, *ptr, *end;
-  gint i, n;
+  int i, n;
 
   g_return_val_if_fail (path != NULL, NULL);
 
@@ -795,7 +795,7 @@ gtk_tree_path_new_first (void)
  */
 void
 gtk_tree_path_append_index (GtkTreePath *path,
-                            gint         index_)
+                            int          index_)
 {
   g_return_if_fail (path != NULL);
   g_return_if_fail (index_ >= 0);
@@ -803,7 +803,7 @@ gtk_tree_path_append_index (GtkTreePath *path,
   if (path->depth == path->alloc)
     {
       path->alloc = MAX (path->alloc * 2, 1);
-      path->indices = g_renew (gint, path->indices, path->alloc);
+      path->indices = g_renew (int, path->indices, path->alloc);
     }
 
   path->depth += 1;
@@ -821,19 +821,19 @@ gtk_tree_path_append_index (GtkTreePath *path,
  */
 void
 gtk_tree_path_prepend_index (GtkTreePath *path,
-                             gint       index)
+                             int        index)
 {
   if (path->depth == path->alloc)
     {
-      gint *indices;
+      int *indices;
       path->alloc = MAX (path->alloc * 2, 1);
-      indices = g_new (gint, path->alloc);
-      memcpy (indices + 1, path->indices, path->depth * sizeof (gint));
+      indices = g_new (int, path->alloc);
+      memcpy (indices + 1, path->indices, path->depth * sizeof (int));
       g_free (path->indices);
       path->indices = indices;
     }
   else if (path->depth > 0)
-    memmove (path->indices + 1, path->indices, path->depth * sizeof (gint));
+    memmove (path->indices + 1, path->indices, path->depth * sizeof (int));
 
   path->depth += 1;
   path->indices[0] = index;
@@ -847,7 +847,7 @@ gtk_tree_path_prepend_index (GtkTreePath *path,
  *
  * Returns: The depth of @path
  */
-gint
+int
 gtk_tree_path_get_depth (GtkTreePath *path)
 {
   g_return_val_if_fail (path != NULL, 0);
@@ -868,7 +868,7 @@ gtk_tree_path_get_depth (GtkTreePath *path)
  *
  * Returns: The current indices, or %NULL
  */
-gint *
+int *
 gtk_tree_path_get_indices (GtkTreePath *path)
 {
   g_return_val_if_fail (path != NULL, NULL);
@@ -891,9 +891,9 @@ gtk_tree_path_get_indices (GtkTreePath *path)
  * Returns: (array length=depth) (transfer none): The current
  *     indices, or %NULL
  */
-gint *
+int *
 gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
-                                      gint        *depth)
+                                      int         *depth)
 {
   g_return_val_if_fail (path != NULL, NULL);
 
@@ -937,8 +937,8 @@ gtk_tree_path_copy (const GtkTreePath *path)
   retval = g_slice_new (GtkTreePath);
   retval->depth = path->depth;
   retval->alloc = retval->depth;
-  retval->indices = g_new (gint, path->alloc);
-  memcpy (retval->indices, path->indices, path->depth * sizeof (gint));
+  retval->indices = g_new (int, path->alloc);
+  memcpy (retval->indices, path->indices, path->depth * sizeof (int));
   return retval;
 }
 
@@ -959,11 +959,11 @@ G_DEFINE_BOXED_TYPE (GtkTreePath, gtk_tree_path,
  *
  * Returns: the relative positions of @a and @b
  */
-gint
+int
 gtk_tree_path_compare (const GtkTreePath *a,
                        const GtkTreePath *b)
 {
-  gint p = 0, q = 0;
+  int p = 0, q = 0;
 
   g_return_val_if_fail (a != NULL, 0);
   g_return_val_if_fail (b != NULL, 0);
@@ -995,7 +995,7 @@ gboolean
 gtk_tree_path_is_ancestor (GtkTreePath *path,
                            GtkTreePath *descendant)
 {
-  gint i;
+  int i;
 
   g_return_val_if_fail (path != NULL, FALSE);
   g_return_val_if_fail (descendant != NULL, FALSE);
@@ -1028,7 +1028,7 @@ gboolean
 gtk_tree_path_is_descendant (GtkTreePath *path,
                              GtkTreePath *ancestor)
 {
-  gint i;
+  int i;
 
   g_return_val_if_fail (path != NULL, FALSE);
   g_return_val_if_fail (ancestor != NULL, FALSE);
@@ -1205,7 +1205,7 @@ gtk_tree_model_get_flags (GtkTreeModel *tree_model)
  *
  * Returns: the number of columns
  */
-gint
+int
 gtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkTreeModelIface *iface;
@@ -1228,7 +1228,7 @@ gtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
  */
 GType
 gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
-                                gint          index)
+                                int           index)
 {
   GtkTreeModelIface *iface;
 
@@ -1408,7 +1408,7 @@ gtk_tree_model_get_path (GtkTreeModel *tree_model,
 void
 gtk_tree_model_get_value (GtkTreeModel *tree_model,
                           GtkTreeIter  *iter,
-                          gint          column,
+                          int           column,
                           GValue       *value)
 {
   GtkTreeModelIface *iface;
@@ -1574,7 +1574,7 @@ gtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
  *
  * Returns: the number of children of @iter
  */
-gint
+int
 gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
                                 GtkTreeIter  *iter)
 {
@@ -1609,7 +1609,7 @@ gboolean
 gtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
                                GtkTreeIter  *iter,
                                GtkTreeIter  *parent,
-                               gint          n)
+                               int           n)
 {
   GtkTreeModelIface *iface;
 
@@ -1775,12 +1775,12 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
                            GtkTreeIter  *iter,
                            va_list      var_args)
 {
-  gint column;
+  int column;
 
   g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
   g_return_if_fail (iter != NULL);
 
-  column = va_arg (var_args, gint);
+  column = va_arg (var_args, int);
 
   while (column != -1)
     {
@@ -1809,7 +1809,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
 
       g_value_unset (&value);
 
-      column = va_arg (var_args, gint);
+      column = va_arg (var_args, int);
     }
 }
 
@@ -1920,7 +1920,7 @@ void
 gtk_tree_model_rows_reordered (GtkTreeModel *tree_model,
                                GtkTreePath  *path,
                                GtkTreeIter  *iter,
-                               gint         *new_order)
+                               int          *new_order)
 {
   g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
   g_return_if_fail (new_order != NULL);
@@ -1951,8 +1951,8 @@ void
 gtk_tree_model_rows_reordered_with_length (GtkTreeModel *tree_model,
                                            GtkTreePath  *path,
                                            GtkTreeIter  *iter,
-                                           gint         *new_order,
-                                           gint          length)
+                                           int          *new_order,
+                                           int           length)
 {
   g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
   g_return_if_fail (new_order != NULL);
@@ -2040,7 +2040,7 @@ gtk_tree_model_foreach (GtkTreeModel            *model,
 
 static void gtk_tree_row_reference_unref_path (GtkTreePath  *path,
                                                GtkTreeModel *model,
-                                               gint          depth);
+                                               int           depth);
 
 
 G_DEFINE_BOXED_TYPE (GtkTreeRowReference, gtk_tree_row_reference,
@@ -2109,7 +2109,7 @@ gtk_tree_row_ref_inserted (RowRefList  *refs,
 
       if (reference->path->depth >= path->depth)
         {
-          gint i;
+          int i;
           gboolean ancestor = TRUE;
 
           for (i = 0; i < path->depth - 1; i ++)
@@ -2155,7 +2155,7 @@ gtk_tree_row_ref_deleted (RowRefList  *refs,
 
       if (reference->path)
         {
-          gint i;
+          int i;
 
           if (path->depth > reference->path->depth)
             goto next;
@@ -2194,10 +2194,10 @@ static void
 gtk_tree_row_ref_reordered (RowRefList  *refs,
                             GtkTreePath *path,
                             GtkTreeIter *iter,
-                            gint        *new_order)
+                            int         *new_order)
 {
   GSList *tmp_list;
-  gint length;
+  int length;
 
   if (refs == NULL)
     return;
@@ -2216,13 +2216,13 @@ gtk_tree_row_ref_reordered (RowRefList  *refs,
       if ((reference->path) &&
           (gtk_tree_path_is_ancestor (path, reference->path)))
         {
-          gint ref_depth = gtk_tree_path_get_depth (reference->path);
-          gint depth = gtk_tree_path_get_depth (path);
+          int ref_depth = gtk_tree_path_get_depth (reference->path);
+          int depth = gtk_tree_path_get_depth (path);
 
           if (ref_depth > depth)
             {
-              gint i;
-              gint *indices = gtk_tree_path_get_indices (reference->path);
+              int i;
+              int *indices = gtk_tree_path_get_indices (reference->path);
 
               for (i = 0; i < length; i++)
                 {
@@ -2246,8 +2246,8 @@ static void
 gtk_tree_row_reference_unref_path_helper (GtkTreePath  *path,
                                           GtkTreeModel *model,
                                           GtkTreeIter  *parent_iter,
-                                          gint          depth,
-                                          gint          current_depth)
+                                          int           depth,
+                                          int           current_depth)
 {
   GtkTreeIter iter;
 
@@ -2262,7 +2262,7 @@ gtk_tree_row_reference_unref_path_helper (GtkTreePath  *path,
 static void
 gtk_tree_row_reference_unref_path (GtkTreePath  *path,
                                    GtkTreeModel *model,
-                                   gint          depth)
+                                   int           depth)
 {
   GtkTreeIter iter;
 
@@ -2343,7 +2343,7 @@ gtk_tree_row_reference_new_proxy (GObject      *proxy,
   GtkTreeRowReference *reference;
   RowRefList *refs;
   GtkTreeIter parent_iter;
-  gint i;
+  int i;
 
   g_return_val_if_fail (G_IS_OBJECT (proxy), NULL);
   g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
@@ -2559,7 +2559,7 @@ void
 gtk_tree_row_reference_reordered (GObject     *proxy,
                                   GtkTreePath *path,
                                   GtkTreeIter *iter,
-                                  gint        *new_order)
+                                  int         *new_order)
 {
   g_return_if_fail (G_IS_OBJECT (proxy));
 
index 9d6ad211b5972daf55daf243dc36944910d1615b..d9e1066cd6a81e3c04a027590075f1c5d63d1cff 100644 (file)
@@ -92,7 +92,7 @@ typedef enum
  */
 struct _GtkTreeIter
 {
-  gint stamp;
+  int stamp;
   gpointer user_data;
   gpointer user_data2;
   gpointer user_data3;
@@ -149,14 +149,14 @@ struct _GtkTreeModelIface
   void         (* rows_reordered)        (GtkTreeModel *tree_model,
                                          GtkTreePath  *path,
                                          GtkTreeIter  *iter,
-                                         gint         *new_order);
+                                         int          *new_order);
 
   /* Virtual Table */
   GtkTreeModelFlags (* get_flags)  (GtkTreeModel *tree_model);
 
-  gint         (* get_n_columns)   (GtkTreeModel *tree_model);
+  int          (* get_n_columns)   (GtkTreeModel *tree_model);
   GType        (* get_column_type) (GtkTreeModel *tree_model,
-                                   gint          index_);
+                                   int           index_);
   gboolean     (* get_iter)        (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreePath  *path);
@@ -164,7 +164,7 @@ struct _GtkTreeModelIface
                                    GtkTreeIter  *iter);
   void         (* get_value)       (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
-                                   gint          column,
+                                   int           column,
                                    GValue       *value);
   gboolean     (* iter_next)       (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter);
@@ -175,12 +175,12 @@ struct _GtkTreeModelIface
                                    GtkTreeIter  *parent);
   gboolean     (* iter_has_child)  (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter);
-  gint         (* iter_n_children) (GtkTreeModel *tree_model,
+  int          (* iter_n_children) (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter);
   gboolean     (* iter_nth_child)  (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreeIter  *parent,
-                                   gint          n);
+                                   int           n);
   gboolean     (* iter_parent)     (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreeIter  *child);
@@ -197,10 +197,10 @@ GtkTreePath *gtk_tree_path_new              (void);
 GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_new_from_string  (const gchar       *path);
 GDK_AVAILABLE_IN_ALL
-GtkTreePath *gtk_tree_path_new_from_indices (gint               first_index,
+GtkTreePath *gtk_tree_path_new_from_indices (int                first_index,
                                             ...);
 GDK_AVAILABLE_IN_ALL
-GtkTreePath *gtk_tree_path_new_from_indicesv (gint             *indices,
+GtkTreePath *gtk_tree_path_new_from_indicesv (int              *indices,
                                              gsize             length);
 GDK_AVAILABLE_IN_ALL
 gchar       *gtk_tree_path_to_string        (GtkTreePath       *path);
@@ -208,18 +208,18 @@ GDK_AVAILABLE_IN_ALL
 GtkTreePath *gtk_tree_path_new_first        (void);
 GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_append_index     (GtkTreePath       *path,
-                                            gint               index_);
+                                            int                index_);
 GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_prepend_index    (GtkTreePath       *path,
-                                            gint               index_);
+                                            int                index_);
 GDK_AVAILABLE_IN_ALL
-gint         gtk_tree_path_get_depth        (GtkTreePath       *path);
+int          gtk_tree_path_get_depth        (GtkTreePath       *path);
 GDK_AVAILABLE_IN_ALL
-gint        *gtk_tree_path_get_indices      (GtkTreePath       *path);
+int         *gtk_tree_path_get_indices      (GtkTreePath       *path);
 
 GDK_AVAILABLE_IN_ALL
-gint        *gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
-                                                  gint        *depth);
+int         *gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
+                                                  int         *depth);
 
 GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_free             (GtkTreePath       *path);
@@ -228,7 +228,7 @@ GtkTreePath *gtk_tree_path_copy             (const GtkTreePath *path);
 GDK_AVAILABLE_IN_ALL
 GType        gtk_tree_path_get_type         (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-gint         gtk_tree_path_compare          (const GtkTreePath *a,
+int          gtk_tree_path_compare          (const GtkTreePath *a,
                                             const GtkTreePath *b);
 GDK_AVAILABLE_IN_ALL
 void         gtk_tree_path_next             (GtkTreePath       *path);
@@ -285,7 +285,7 @@ GDK_AVAILABLE_IN_ALL
 void                 gtk_tree_row_reference_reordered (GObject     *proxy,
                                                       GtkTreePath *path,
                                                       GtkTreeIter *iter,
-                                                      gint        *new_order);
+                                                      int         *new_order);
 
 /* GtkTreeIter operations */
 GDK_AVAILABLE_IN_ALL
@@ -300,10 +300,10 @@ GType             gtk_tree_model_get_type        (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GtkTreeModelFlags gtk_tree_model_get_flags       (GtkTreeModel *tree_model);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
+int               gtk_tree_model_get_n_columns   (GtkTreeModel *tree_model);
 GDK_AVAILABLE_IN_ALL
 GType             gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
-                                                 gint          index_);
+                                                 int           index_);
 
 
 /* Iterator movement */
@@ -327,7 +327,7 @@ GtkTreePath *     gtk_tree_model_get_path        (GtkTreeModel *tree_model,
 GDK_AVAILABLE_IN_ALL
 void              gtk_tree_model_get_value       (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
-                                                 gint          column,
+                                                 int           column,
                                                  GValue       *value);
 GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_previous   (GtkTreeModel *tree_model,
@@ -343,13 +343,13 @@ GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_has_child  (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
 GDK_AVAILABLE_IN_ALL
-gint              gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
+int               gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter);
 GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_nth_child  (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
                                                  GtkTreeIter  *parent,
-                                                 gint          n);
+                                                 int           n);
 GDK_AVAILABLE_IN_ALL
 gboolean          gtk_tree_model_iter_parent     (GtkTreeModel *tree_model,
                                                  GtkTreeIter  *iter,
@@ -395,13 +395,13 @@ GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_rows_reordered        (GtkTreeModel *tree_model,
                                           GtkTreePath  *path,
                                           GtkTreeIter  *iter,
-                                          gint         *new_order);
+                                          int          *new_order);
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_model_rows_reordered_with_length (GtkTreeModel *tree_model,
                                                GtkTreePath  *path,
                                                GtkTreeIter  *iter,
-                                               gint         *new_order,
-                                               gint          length);
+                                               int          *new_order,
+                                               int           length);
 
 G_END_DECLS
 
index 25fe8c700caf21f22ed26899f2b3796119d8c0be..12b412d0161c203d2141309d8b1e587ad0aff98f 100644 (file)
@@ -242,10 +242,10 @@ struct _FilterElt
 {
   GtkTreeIter iter;
   FilterLevel *children;
-  gint offset;
-  gint ref_count;
-  gint ext_ref_count;
-  gint zero_ref_count;
+  int offset;
+  int ref_count;
+  int ext_ref_count;
+  int zero_ref_count;
   GSequenceIter *visible_siter; /* iter into visible_seq */
 };
 
@@ -253,8 +253,8 @@ struct _FilterLevel
 {
   GSequence *seq;
   GSequence *visible_seq;
-  gint ref_count;
-  gint ext_ref_count;
+  int ref_count;
+  int ext_ref_count;
 
   FilterElt *parent_elt;
   FilterLevel *parent_level;
@@ -267,10 +267,10 @@ struct _GtkTreeModelFilterPrivate
   gpointer root;
   GtkTreePath *virtual_root;
 
-  gint stamp;
+  int stamp;
   guint child_flags;
-  gint zero_ref_count;
-  gint visible_column;
+  int zero_ref_count;
+  int visible_column;
 
   GtkTreeModelFilterVisibleFunc visible_func;
   gpointer visible_data;
@@ -280,7 +280,7 @@ struct _GtkTreeModelFilterPrivate
   GtkTreeModelFilterModifyFunc modify_func;
   gpointer modify_data;
   GDestroyNotify modify_destroy;
-  gint modify_n_columns;
+  int modify_n_columns;
 
   guint visible_method_set   : 1;
   guint modify_func_set      : 1;
@@ -357,14 +357,14 @@ static void         gtk_tree_model_filter_row_deleted                     (GtkTr
 static void         gtk_tree_model_filter_rows_reordered                  (GtkTreeModel           *c_model,
                                                                            GtkTreePath            *c_path,
                                                                            GtkTreeIter            *c_iter,
-                                                                           gint                   *new_order,
+                                                                           int                    *new_order,
                                                                            gpointer                data);
 
 /* GtkTreeModel interface */
 static GtkTreeModelFlags gtk_tree_model_filter_get_flags                       (GtkTreeModel           *model);
-static gint         gtk_tree_model_filter_get_n_columns                   (GtkTreeModel           *model);
+static int          gtk_tree_model_filter_get_n_columns                   (GtkTreeModel           *model);
 static GType        gtk_tree_model_filter_get_column_type                 (GtkTreeModel           *model,
-                                                                           gint                    index);
+                                                                           int                     index);
 static gboolean     gtk_tree_model_filter_get_iter_full                   (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter,
                                                                            GtkTreePath            *path);
@@ -375,7 +375,7 @@ static GtkTreePath *gtk_tree_model_filter_get_path                        (GtkTr
                                                                            GtkTreeIter            *iter);
 static void         gtk_tree_model_filter_get_value                       (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter,
-                                                                           gint                    column,
+                                                                           int                     column,
                                                                            GValue                 *value);
 static gboolean     gtk_tree_model_filter_iter_next                       (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter);
@@ -386,12 +386,12 @@ static gboolean     gtk_tree_model_filter_iter_children                   (GtkTr
                                                                            GtkTreeIter            *parent);
 static gboolean     gtk_tree_model_filter_iter_has_child                  (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter);
-static gint         gtk_tree_model_filter_iter_n_children                 (GtkTreeModel           *model,
+static int          gtk_tree_model_filter_iter_n_children                 (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter);
 static gboolean     gtk_tree_model_filter_iter_nth_child                  (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter,
                                                                            GtkTreeIter            *parent,
-                                                                           gint                    n);
+                                                                           int                     n);
 static gboolean     gtk_tree_model_filter_iter_parent                     (GtkTreeModel           *model,
                                                                            GtkTreeIter            *iter,
                                                                            GtkTreeIter            *child);
@@ -436,7 +436,7 @@ static void         gtk_tree_model_filter_real_modify                     (GtkTr
                                                                            GtkTreeModel           *child_model,
                                                                            GtkTreeIter            *iter,
                                                                            GValue                 *value,
-                                                                           gint                    column);
+                                                                           int                     column);
 static gboolean     gtk_tree_model_filter_real_visible                    (GtkTreeModelFilter     *filter,
                                                                            GtkTreeModel           *child_model,
                                                                            GtkTreeIter            *child_iter);
@@ -474,12 +474,12 @@ static gboolean    gtk_tree_model_filter_elt_is_visible_in_target         (Filte
 static FilterElt   *gtk_tree_model_filter_insert_elt_in_level             (GtkTreeModelFilter     *filter,
                                                                            GtkTreeIter            *c_iter,
                                                                            FilterLevel            *level,
-                                                                           gint                    offset,
-                                                                           gint                   *index);
+                                                                           int                     offset,
+                                                                           int                    *index);
 static FilterElt   *gtk_tree_model_filter_fetch_child                     (GtkTreeModelFilter     *filter,
                                                                            FilterLevel            *level,
-                                                                           gint                    offset,
-                                                                           gint                   *index);
+                                                                           int                     offset,
+                                                                           int                    *index);
 static void         gtk_tree_model_filter_remove_elt_from_level           (GtkTreeModelFilter     *filter,
                                                                            FilterLevel            *level,
                                                                            FilterElt              *elt);
@@ -662,7 +662,7 @@ filter_elt_free (gpointer elt)
   g_slice_free (FilterElt, elt);
 }
 
-static gint
+static int
 filter_elt_cmp (gconstpointer a,
                 gconstpointer b,
                 gpointer      user_data)
@@ -680,7 +680,7 @@ filter_elt_cmp (gconstpointer a,
 
 static FilterElt *
 lookup_elt_with_offset (GSequence      *seq,
-                        gint            offset,
+                        int             offset,
                         GSequenceIter **ret_siter)
 {
   GSequenceIter *siter;
@@ -700,7 +700,7 @@ increase_offset_iter (gpointer data,
                       gpointer user_data)
 {
   FilterElt *elt = data;
-  gint offset = GPOINTER_TO_INT (user_data);
+  int offset = GPOINTER_TO_INT (user_data);
 
   if (elt->offset >= offset)
     elt->offset++;
@@ -711,7 +711,7 @@ decrease_offset_iter (gpointer data,
                       gpointer user_data)
 {
   FilterElt *elt = data;
-  gint offset = GPOINTER_TO_INT (user_data);
+  int offset = GPOINTER_TO_INT (user_data);
 
   if (elt->offset > offset)
     elt->offset--;
@@ -730,8 +730,8 @@ gtk_tree_model_filter_build_level (GtkTreeModelFilter *filter,
   FilterLevel *tmp_level;
   FilterElt *tmp_elt;
   GtkTreeIter f_iter;
-  gint length = 0;
-  gint i;
+  int length = 0;
+  int i;
   gboolean empty = TRUE;
 
   g_assert (filter->priv->child_model != NULL);
@@ -1139,8 +1139,8 @@ gtk_tree_model_filter_level_transfer_first_ref (GtkTreeModelFilter *filter,
 static void
 gtk_tree_model_filter_level_transfer_first_ref_with_index (GtkTreeModelFilter *filter,
                                                            FilterLevel        *level,
-                                                           gint                from_index,
-                                                           gint                to_index)
+                                                           int                 from_index,
+                                                           int                 to_index)
 {
   gtk_tree_model_filter_level_transfer_first_ref (filter, level,
                                                   g_sequence_get_iter_at_pos (level->seq, from_index),
@@ -1186,7 +1186,7 @@ gtk_tree_model_filter_add_root (GtkTreePath *src,
                                 GtkTreePath *root)
 {
   GtkTreePath *retval;
-  gint i;
+  int i;
 
   retval = gtk_tree_path_copy (root);
 
@@ -1201,9 +1201,9 @@ gtk_tree_model_filter_remove_root (GtkTreePath *src,
                                    GtkTreePath *root)
 {
   GtkTreePath *retval;
-  gint i;
-  gint depth;
-  gint *indices;
+  int i;
+  int depth;
+  int *indices;
 
   if (gtk_tree_path_get_depth (src) <= gtk_tree_path_get_depth (root))
     return NULL;
@@ -1518,8 +1518,8 @@ static FilterElt *
 gtk_tree_model_filter_insert_elt_in_level (GtkTreeModelFilter *filter,
                                            GtkTreeIter        *c_iter,
                                            FilterLevel        *level,
-                                           gint                offset,
-                                           gint               *index)
+                                           int                 offset,
+                                           int                *index)
 {
   FilterElt *elt;
   GSequenceIter *siter;
@@ -1556,10 +1556,10 @@ gtk_tree_model_filter_insert_elt_in_level (GtkTreeModelFilter *filter,
 static FilterElt *
 gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter,
                                    FilterLevel        *level,
-                                   gint                offset,
-                                   gint               *index)
+                                   int                 offset,
+                                   int                *index)
 {
-  gint len;
+  int len;
   GtkTreePath *c_path = NULL;
   GtkTreeIter c_iter;
   GtkTreePath *c_parent_path = NULL;
@@ -1625,7 +1625,7 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter,
 {
   FilterElt *parent;
   FilterLevel *parent_level;
-  gint length, orig_level_ext_ref_count;
+  int length, orig_level_ext_ref_count;
   GtkTreeIter iter;
   GtkTreePath *path = NULL;
 
@@ -2122,7 +2122,7 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model,
   GSequenceIter *siter;
   FilterElt dummy;
 
-  gint i = 0, offset;
+  int i = 0, offset;
 
   gboolean free_c_path = FALSE;
   gboolean emit_row_inserted = FALSE;
@@ -2148,8 +2148,8 @@ gtk_tree_model_filter_row_inserted (GtkTreeModel *c_model,
       if (gtk_tree_path_get_depth (filter->priv->virtual_root) >=
           gtk_tree_path_get_depth (c_path))
         {
-          gint depth;
-          gint *v_indices, *c_indices;
+          int depth;
+          int *v_indices, *c_indices;
           gboolean common_prefix = TRUE;
 
           depth = gtk_tree_path_get_depth (c_path) - 1;
@@ -2391,7 +2391,7 @@ static void
 gtk_tree_model_filter_virtual_root_deleted (GtkTreeModelFilter *filter,
                                             GtkTreePath        *c_path)
 {
-  gint i, nodes;
+  int i, nodes;
   GtkTreePath *path;
   FilterLevel *level = FILTER_LEVEL (filter->priv->root);
 
@@ -2436,9 +2436,9 @@ static void
 gtk_tree_model_filter_adjust_virtual_root (GtkTreeModelFilter *filter,
                                            GtkTreePath        *c_path)
 {
-  gint i;
-  gint level;
-  gint *v_indices, *c_indices;
+  int i;
+  int level;
+  int *v_indices, *c_indices;
   gboolean common_prefix = TRUE;
 
   level = gtk_tree_path_get_depth (c_path) - 1;
@@ -2535,8 +2535,8 @@ gtk_tree_model_filter_row_deleted (GtkTreeModel *c_model,
   GSequenceIter *siter;
   gboolean emit_child_toggled = FALSE;
   gboolean emit_row_deleted = FALSE;
-  gint offset;
-  gint orig_level_ext_ref_count;
+  int offset;
+  int orig_level_ext_ref_count;
 
   g_return_if_fail (c_path != NULL);
 
@@ -2705,7 +2705,7 @@ static void
 gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
                                       GtkTreePath  *c_path,
                                       GtkTreeIter  *c_iter,
-                                      gint         *new_order,
+                                      int          *new_order,
                                       gpointer      data)
 {
   FilterElt *elt;
@@ -2718,9 +2718,9 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
   GSequence *tmp_seq;
   GSequenceIter *tmp_end_iter;
   GSequenceIter *old_first_siter = NULL;
-  gint *tmp_array;
-  gint i, elt_count;
-  gint length;
+  int *tmp_array;
+  int i, elt_count;
+  int length;
 
   g_return_if_fail (new_order != NULL);
 
@@ -2730,7 +2730,7 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
 
       if (filter->priv->virtual_root)
         {
-          gint new_pos = -1;
+          int new_pos = -1;
 
           /* reorder root level of path */
           for (i = 0; i < length; i++)
@@ -2755,9 +2755,9 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
       if (filter->priv->virtual_root &&
          gtk_tree_path_is_ancestor (c_path, filter->priv->virtual_root))
         {
-          gint new_pos = -1;
-          gint len;
-          gint depth;
+          int new_pos = -1;
+          int len;
+          int depth;
           GtkTreeIter real_c_iter;
 
           depth = gtk_tree_path_get_depth (c_path);
@@ -2834,7 +2834,7 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model,
 
   tmp_seq = g_sequence_new (filter_elt_free);
   tmp_end_iter = g_sequence_get_end_iter (tmp_seq);
-  tmp_array = g_new (gint, g_sequence_get_length (level->visible_seq));
+  tmp_array = g_new (int, g_sequence_get_length (level->visible_seq));
   elt_count = 0;
 
   old_first_siter = g_sequence_get_iter_at_pos (level->seq, 0);
@@ -2912,7 +2912,7 @@ gtk_tree_model_filter_get_flags (GtkTreeModel *model)
   return 0;
 }
 
-static gint
+static int
 gtk_tree_model_filter_get_n_columns (GtkTreeModel *model)
 {
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
@@ -2934,7 +2934,7 @@ gtk_tree_model_filter_get_n_columns (GtkTreeModel *model)
 
 static GType
 gtk_tree_model_filter_get_column_type (GtkTreeModel *model,
-                                       gint          index)
+                                       int           index)
 {
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
 
@@ -2964,10 +2964,10 @@ gtk_tree_model_filter_get_iter_full (GtkTreeModel *model,
                                      GtkTreePath  *path)
 {
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
-  gint *indices;
+  int *indices;
   FilterLevel *level;
   FilterElt *elt;
-  gint depth, i;
+  int depth, i;
   GSequenceIter *siter;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
@@ -3035,11 +3035,11 @@ gtk_tree_model_filter_get_iter (GtkTreeModel *model,
                                 GtkTreePath  *path)
 {
   GtkTreeModelFilter *filter = (GtkTreeModelFilter *)model;
-  gint *indices;
+  int *indices;
   FilterLevel *level;
   FilterElt *elt;
   GSequenceIter *siter;
-  gint depth, i;
+  int depth, i;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (model), FALSE);
   g_return_val_if_fail (filter->priv->child_model != NULL, FALSE);
@@ -3121,7 +3121,7 @@ gtk_tree_model_filter_get_path (GtkTreeModel *model,
 
   while (level)
     {
-      gint index;
+      int index;
 
       index = g_sequence_iter_get_position (elt->visible_siter);
       gtk_tree_path_prepend_index (retval, index);
@@ -3138,7 +3138,7 @@ gtk_tree_model_filter_real_modify (GtkTreeModelFilter *self,
                                    GtkTreeModel       *child_model,
                                    GtkTreeIter        *iter,
                                    GValue             *value,
-                                   gint                column)
+                                   int                 column)
 {
   if (self->priv->modify_func)
     {
@@ -3162,7 +3162,7 @@ gtk_tree_model_filter_real_modify (GtkTreeModelFilter *self,
 static void
 gtk_tree_model_filter_get_value (GtkTreeModel *model,
                                  GtkTreeIter  *iter,
-                                 gint          column,
+                                 int           column,
                                  GValue       *value)
 {
   GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (model);
@@ -3324,7 +3324,7 @@ gtk_tree_model_filter_iter_has_child (GtkTreeModel *model,
   return FALSE;
 }
 
-static gint
+static int
 gtk_tree_model_filter_iter_n_children (GtkTreeModel *model,
                                        GtkTreeIter  *iter)
 {
@@ -3371,7 +3371,7 @@ static gboolean
 gtk_tree_model_filter_iter_nth_child (GtkTreeModel *model,
                                       GtkTreeIter  *iter,
                                       GtkTreeIter  *parent,
-                                      gint          n)
+                                      int           n)
 {
   FilterLevel *level;
   GtkTreeIter children;
@@ -3875,7 +3875,7 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter            *filter,
  */
 void
 gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter           *filter,
-                                       gint                          n_columns,
+                                       int                           n_columns,
                                        GType                        *types,
                                        GtkTreeModelFilterModifyFunc  func,
                                        gpointer                      data,
@@ -3898,7 +3898,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter           *filter,
 /**
  * gtk_tree_model_filter_set_visible_column:
  * @filter: A #GtkTreeModelFilter
- * @column: A #gint which is the column containing the visible information
+ * @column: A #int which is the column containing the visible information
  *
  * Sets @column of the child_model to be the column where @filter should
  * look for visibility information. @columns should be a column of type
@@ -3911,7 +3911,7 @@ gtk_tree_model_filter_set_modify_func (GtkTreeModelFilter           *filter,
  */
 void
 gtk_tree_model_filter_set_visible_column (GtkTreeModelFilter *filter,
-                                          gint column)
+                                          int column)
 {
   g_return_if_fail (GTK_IS_TREE_MODEL_FILTER (filter));
   g_return_if_fail (column >= 0);
@@ -4016,12 +4016,12 @@ gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filte
                                                        gboolean            build_levels,
                                                        gboolean            fetch_children)
 {
-  gint *child_indices;
+  int *child_indices;
   GtkTreePath *retval;
   GtkTreePath *real_path;
   FilterLevel *level;
   FilterElt *tmp;
-  gint i;
+  int i;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (filter), NULL);
   g_return_val_if_fail (filter->priv->child_model != NULL, NULL);
@@ -4159,10 +4159,10 @@ GtkTreePath *
 gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter *filter,
                                                   GtkTreePath        *filter_path)
 {
-  gint *filter_indices;
+  int *filter_indices;
   GtkTreePath *retval;
   FilterLevel *level;
-  gint i;
+  int i;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_FILTER (filter), NULL);
   g_return_val_if_fail (filter->priv->child_model != NULL, NULL);
index f49005f99bc1593dba2ce09595689c1f0c4a80d8..28ca44c99651c4317f61408913c1900e14d1694c 100644 (file)
@@ -69,7 +69,7 @@ typedef gboolean (* GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
 typedef void (* GtkTreeModelFilterModifyFunc) (GtkTreeModel *model,
                                                GtkTreeIter  *iter,
                                                GValue       *value,
-                                               gint          column,
+                                               int           column,
                                                gpointer      data);
 
 typedef struct _GtkTreeModelFilter          GtkTreeModelFilter;
@@ -95,7 +95,7 @@ struct _GtkTreeModelFilterClass
                    GtkTreeModel       *child_model,
                    GtkTreeIter        *iter,
                    GValue             *value,
-                   gint                column);
+                   int                 column);
 
   /*< private >*/
 
@@ -115,14 +115,14 @@ void          gtk_tree_model_filter_set_visible_func           (GtkTreeModelFilt
                                                                 GDestroyNotify                destroy);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_set_modify_func            (GtkTreeModelFilter           *filter,
-                                                                gint                          n_columns,
+                                                                int                           n_columns,
                                                                 GType                        *types,
                                                                 GtkTreeModelFilterModifyFunc  func,
                                                                 gpointer                      data,
                                                                 GDestroyNotify                destroy);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_model_filter_set_visible_column         (GtkTreeModelFilter           *filter,
-                                                                gint                          column);
+                                                                int                           column);
 
 GDK_AVAILABLE_IN_ALL
 GtkTreeModel *gtk_tree_model_filter_get_model                  (GtkTreeModelFilter           *filter);
index 49a1ac784fe1c65ff3513936a6321f0f09f8ea10..0b6d83aef33f45fe52a6dc2f98cebe6cc18a01eb 100644 (file)
@@ -221,17 +221,17 @@ struct _SortElt
 {
   GtkTreeIter    iter;
   SortLevel     *children;
-  gint           offset;
-  gint           ref_count;
-  gint           zero_ref_count;
-  gint           old_index; /* used while sorting */
+  int            offset;
+  int            ref_count;
+  int            zero_ref_count;
+  int            old_index; /* used while sorting */
   GSequenceIter *siter; /* iter into seq */
 };
 
 struct _SortLevel
 {
   GSequence *seq;
-  gint       ref_count;
+  int        ref_count;
   SortElt   *parent_elt;
   SortLevel *parent_level;
 };
@@ -243,8 +243,8 @@ struct _SortData
   gpointer sort_data;
 
   GtkTreePath *parent_path;
-  gint *parent_path_indices;
-  gint parent_path_depth;
+  int *parent_path_indices;
+  int parent_path_depth;
 };
 
 /* Properties */
@@ -258,14 +258,14 @@ enum {
 struct _GtkTreeModelSortPrivate
 {
   gpointer root;
-  gint stamp;
+  int stamp;
   guint child_flags;
   GtkTreeModel *child_model;
-  gint zero_ref_count;
+  int zero_ref_count;
 
   /* sort information */
   GList *sort_list;
-  gint sort_column_id;
+  int sort_column_id;
   GtkSortType order;
 
   /* default sort */
@@ -337,14 +337,14 @@ static void gtk_tree_model_sort_row_deleted           (GtkTreeModel          *mo
 static void gtk_tree_model_sort_rows_reordered        (GtkTreeModel          *s_model,
                                                       GtkTreePath           *s_path,
                                                       GtkTreeIter           *s_iter,
-                                                      gint                  *new_order,
+                                                      int                   *new_order,
                                                       gpointer               data);
 
 /* TreeModel interface */
 static GtkTreeModelFlags gtk_tree_model_sort_get_flags     (GtkTreeModel          *tree_model);
-static gint         gtk_tree_model_sort_get_n_columns      (GtkTreeModel          *tree_model);
+static int          gtk_tree_model_sort_get_n_columns      (GtkTreeModel          *tree_model);
 static GType        gtk_tree_model_sort_get_column_type    (GtkTreeModel          *tree_model,
-                                                            gint                   index);
+                                                            int                    index);
 static gboolean     gtk_tree_model_sort_get_iter           (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter,
                                                             GtkTreePath           *path);
@@ -352,7 +352,7 @@ static GtkTreePath *gtk_tree_model_sort_get_path           (GtkTreeModel
                                                             GtkTreeIter           *iter);
 static void         gtk_tree_model_sort_get_value          (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter,
-                                                            gint                   column,
+                                                            int                    column,
                                                             GValue                *value);
 static gboolean     gtk_tree_model_sort_iter_next          (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter);
@@ -363,12 +363,12 @@ static gboolean     gtk_tree_model_sort_iter_children      (GtkTreeModel
                                                             GtkTreeIter           *parent);
 static gboolean     gtk_tree_model_sort_iter_has_child     (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter);
-static gint         gtk_tree_model_sort_iter_n_children    (GtkTreeModel          *tree_model,
+static int          gtk_tree_model_sort_iter_n_children    (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter);
 static gboolean     gtk_tree_model_sort_iter_nth_child     (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter,
                                                             GtkTreeIter           *parent,
-                                                            gint                   n);
+                                                            int                    n);
 static gboolean     gtk_tree_model_sort_iter_parent        (GtkTreeModel          *tree_model,
                                                             GtkTreeIter           *iter,
                                                             GtkTreeIter           *child);
@@ -391,13 +391,13 @@ static gboolean     gtk_tree_model_sort_drag_data_delete      (GtkTreeDragSource
 
 /* TreeSortable interface */
 static gboolean     gtk_tree_model_sort_get_sort_column_id    (GtkTreeSortable        *sortable,
-                                                              gint                   *sort_column_id,
+                                                              int                    *sort_column_id,
                                                               GtkSortType            *order);
 static void         gtk_tree_model_sort_set_sort_column_id    (GtkTreeSortable        *sortable,
-                                                              gint                    sort_column_id,
+                                                              int                     sort_column_id,
                                                               GtkSortType        order);
 static void         gtk_tree_model_sort_set_sort_func         (GtkTreeSortable        *sortable,
-                                                              gint                    sort_column_id,
+                                                              int                     sort_column_id,
                                                               GtkTreeIterCompareFunc  func,
                                                               gpointer                data,
                                                               GDestroyNotify          destroy);
@@ -432,10 +432,10 @@ static GtkTreePath *gtk_real_tree_model_sort_convert_child_path_to_path (GtkTree
                                                                         GtkTreePath      *child_path,
                                                                         gboolean          build_levels);
 
-static gint         gtk_tree_model_sort_compare_func        (gconstpointer     a,
+static int          gtk_tree_model_sort_compare_func        (gconstpointer     a,
                                                              gconstpointer     b,
                                                              gpointer          user_data);
-static gint         gtk_tree_model_sort_offset_compare_func (gconstpointer     a,
+static int          gtk_tree_model_sort_offset_compare_func (gconstpointer     a,
                                                              gconstpointer     b,
                                                              gpointer          user_data);
 static void         gtk_tree_model_sort_clear_cache_helper  (GtkTreeModelSort *tree_model_sort,
@@ -633,7 +633,7 @@ increase_offset_iter (gpointer data,
                       gpointer user_data)
 {
   SortElt *elt = data;
-  gint offset = GPOINTER_TO_INT (user_data);
+  int offset = GPOINTER_TO_INT (user_data);
 
   if (elt->offset >= offset)
     elt->offset++;
@@ -644,7 +644,7 @@ decrease_offset_iter (gpointer data,
                       gpointer user_data)
 {
   SortElt *elt = data;
-  gint offset = GPOINTER_TO_INT (user_data);
+  int offset = GPOINTER_TO_INT (user_data);
 
   if (elt->offset > offset)
     elt->offset--;
@@ -704,7 +704,7 @@ free_sort_data (SortData *data)
 static SortElt *
 lookup_elt_with_offset (GtkTreeModelSort *tree_model_sort,
                         SortLevel        *level,
-                        gint              offset,
+                        int               offset,
                         GSequenceIter   **ret_siter)
 {
   GSequenceIter *siter, *end_siter;
@@ -749,7 +749,7 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
 
   gboolean free_s_path = FALSE;
 
-  gint index = 0, old_index;
+  int index = 0, old_index;
 
   g_return_if_fail (start_s_path != NULL || start_s_iter != NULL);
 
@@ -815,12 +815,12 @@ gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
   /* if the item moved, then emit rows_reordered */
   if (old_index != index)
     {
-      gint *new_order;
-      gint j;
+      int *new_order;
+      int j;
 
       GtkTreePath *tmppath;
 
-      new_order = g_new (gint, g_sequence_get_length (level->seq));
+      new_order = g_new (int, g_sequence_get_length (level->seq));
 
       for (j = 0; j < g_sequence_get_length (level->seq); j++)
         {
@@ -891,7 +891,7 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel          *s_model,
   GtkTreeIter iter;
   GtkTreeIter real_s_iter;
 
-  gint i = 0;
+  int i = 0;
 
   gboolean free_s_path = FALSE;
 
@@ -1027,7 +1027,7 @@ gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
   SortElt *elt;
   SortLevel *level;
   GtkTreeIter iter;
-  gint offset;
+  int offset;
 
   g_return_if_fail (s_path != NULL);
 
@@ -1089,13 +1089,13 @@ static void
 gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
                                    GtkTreePath  *s_path,
                                    GtkTreeIter  *s_iter,
-                                   gint         *new_order,
+                                   int          *new_order,
                                    gpointer      data)
 {
   SortLevel *level;
   GtkTreeIter iter;
   GtkTreePath *path;
-  gint *tmp_array;
+  int *tmp_array;
   int i, length;
   GSequenceIter *siter, *end_siter;
   GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
@@ -1148,7 +1148,7 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
        siter != end_siter;
        siter = g_sequence_iter_next (siter))
     {
-      gint j;
+      int j;
       SortElt *elt = g_sequence_get (siter);
 
       for (j = 0; j < length; j++)
@@ -1218,7 +1218,7 @@ gtk_tree_model_sort_get_flags (GtkTreeModel *tree_model)
   return 0;
 }
 
-static gint
+static int
 gtk_tree_model_sort_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
@@ -1231,7 +1231,7 @@ gtk_tree_model_sort_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 gtk_tree_model_sort_get_column_type (GtkTreeModel *tree_model,
-                                     gint          index)
+                                     int           index)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
 
@@ -1247,10 +1247,10 @@ gtk_tree_model_sort_get_iter (GtkTreeModel *tree_model,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint *indices;
+  int *indices;
   SortElt *elt;
   SortLevel *level;
-  gint depth, i;
+  int depth, i;
   GSequenceIter *siter;
 
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
@@ -1332,7 +1332,7 @@ gtk_tree_model_sort_get_path (GtkTreeModel *tree_model,
 
   while (level)
     {
-      gint index;
+      int index;
 
       index = g_sequence_iter_get_position (elt->siter);
       gtk_tree_path_prepend_index (retval, index);
@@ -1347,7 +1347,7 @@ gtk_tree_model_sort_get_path (GtkTreeModel *tree_model,
 static void
 gtk_tree_model_sort_get_value (GtkTreeModel *tree_model,
                               GtkTreeIter  *iter,
-                              gint          column,
+                              int           column,
                               GValue       *value)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
@@ -1476,7 +1476,7 @@ gtk_tree_model_sort_iter_has_child (GtkTreeModel *tree_model,
   return gtk_tree_model_iter_has_child (priv->child_model, &child_iter);
 }
 
-static gint
+static int
 gtk_tree_model_sort_iter_n_children (GtkTreeModel *tree_model,
                                     GtkTreeIter  *iter)
 {
@@ -1500,7 +1500,7 @@ static gboolean
 gtk_tree_model_sort_iter_nth_child (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreeIter  *parent,
-                                   gint          n)
+                                   int           n)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   SortLevel *level;
@@ -1659,7 +1659,7 @@ gtk_tree_model_sort_unref_node (GtkTreeModel *tree_model,
 /* Sortable interface */
 static gboolean
 gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable *sortable,
-                                       gint            *sort_column_id,
+                                       int             *sort_column_id,
                                        GtkSortType     *order)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
@@ -1679,7 +1679,7 @@ gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable *sortable,
 
 static void
 gtk_tree_model_sort_set_sort_column_id (GtkTreeSortable *sortable,
-                                       gint             sort_column_id,
+                                       int              sort_column_id,
                                        GtkSortType      order)
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *)sortable;
@@ -1715,7 +1715,7 @@ gtk_tree_model_sort_set_sort_column_id (GtkTreeSortable *sortable,
 
 static void
 gtk_tree_model_sort_set_sort_func (GtkTreeSortable        *sortable,
-                                  gint                    sort_column_id,
+                                  int                     sort_column_id,
                                   GtkTreeIterCompareFunc  func,
                                   gpointer                data,
                                   GDestroyNotify          destroy)
@@ -1812,7 +1812,7 @@ gtk_tree_model_sort_drag_data_delete (GtkTreeDragSource *drag_source,
 }
 
 /* sorting code - private */
-static gint
+static int
 gtk_tree_model_sort_compare_func (gconstpointer a,
                                  gconstpointer b,
                                  gpointer      user_data)
@@ -1824,7 +1824,7 @@ gtk_tree_model_sort_compare_func (gconstpointer a,
   const SortElt *sb = b;
 
   GtkTreeIter iter_a, iter_b;
-  gint retval;
+  int retval;
 
   if (GTK_TREE_MODEL_SORT_CACHE_CHILD_ITERS (tree_model_sort))
     {
@@ -1854,12 +1854,12 @@ gtk_tree_model_sort_compare_func (gconstpointer a,
   return retval;
 }
 
-static gint
+static int
 gtk_tree_model_sort_offset_compare_func (gconstpointer a,
                                         gconstpointer b,
                                         gpointer      user_data)
 {
-  gint retval;
+  int retval;
 
   const SortElt *sa = (SortElt *)a;
   const SortElt *sb = (SortElt *)b;
@@ -1891,10 +1891,10 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
                                gboolean          emit_reordered)
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint i;
+  int i;
   GSequenceIter *begin_siter, *end_siter, *siter;
   SortElt *begin_elt;
-  gint *new_order;
+  int *new_order;
 
   GtkTreeIter iter;
   GtkTreePath *path;
@@ -1937,7 +1937,7 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
 
   free_sort_data (&data);
 
-  new_order = g_new (gint, g_sequence_get_length (level->seq));
+  new_order = g_new (int, g_sequence_get_length (level->seq));
 
   i = 0;
   end_siter = g_sequence_get_end_iter (level->seq);
@@ -2044,7 +2044,7 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *tree_model_sort,
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   SortElt *elt;
   SortData data;
-  gint offset;
+  int offset;
 
   elt = sort_elt_new ();
 
@@ -2155,7 +2155,7 @@ gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
   if (child_model)
     {
       GType *types;
-      gint i, n_columns;
+      int i, n_columns;
 
       priv->changed_id =
         g_signal_connect (child_model, "row-changed",
@@ -2216,10 +2216,10 @@ gtk_real_tree_model_sort_convert_child_path_to_path (GtkTreeModelSort *tree_mode
                                                     gboolean          build_levels)
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint *child_indices;
+  int *child_indices;
   GtkTreePath *retval;
   SortLevel *level;
-  gint i;
+  int i;
 
   g_return_val_if_fail (priv->child_model != NULL, NULL);
   g_return_val_if_fail (child_path != NULL, NULL);
@@ -2361,10 +2361,10 @@ gtk_tree_model_sort_convert_path_to_child_path (GtkTreeModelSort *tree_model_sor
                                                GtkTreePath      *sorted_path)
 {
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  gint *sorted_indices;
+  int *sorted_indices;
   GtkTreePath *retval;
   SortLevel *level;
-  gint i;
+  int i;
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (tree_model_sort), NULL);
   g_return_val_if_fail (priv->child_model != NULL, NULL);
@@ -2459,8 +2459,8 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
   GtkTreeIter iter;
   SortLevel *new_level;
-  gint length = 0;
-  gint i;
+  int length = 0;
+  int i;
 
   g_assert (priv->child_model != NULL);
 
index 232a85d9f893646422070c6e2da3db6ee5f86172..c67357dd645218b12cf5c10335635777512fbd7b 100644 (file)
@@ -335,7 +335,7 @@ row_inserted_cb (GtkTreeModel   *model,
                  GtkTreeIter    *iter,
                  GtkTreePopover *popover)
 {
-  gint *indices, depth, index;
+  int *indices, depth, index;
   GtkWidget *item;
   GtkWidget *box;
 
@@ -389,7 +389,7 @@ row_changed_cb (GtkTreeModel   *model,
 {
   gboolean is_separator = FALSE;
   GtkWidget *item;
-  gint *indices, depth, index;
+  int *indices, depth, index;
 
   item = gtk_tree_popover_get_path_item (popover, path);
 
@@ -422,7 +422,7 @@ static void
 row_reordered_cb (GtkTreeModel   *model,
                   GtkTreePath    *path,
                   GtkTreeIter    *iter,
-                  gint           *new_order,
+                  int            *new_order,
                   GtkTreePopover *popover)
 {
   rebuild_menu (popover);
index ede31a714bdb8ca8c129bab7534216889713c53d..37dafa8e011e0ee4bd489f9a908b0ad24f657c0f 100644 (file)
@@ -91,7 +91,7 @@ void _gtk_tree_view_column_realize_button   (GtkTreeViewColumn *column);
 
 void _gtk_tree_view_column_set_tree_view    (GtkTreeViewColumn *column,
                                             GtkTreeView       *tree_view);
-gint _gtk_tree_view_column_request_width    (GtkTreeViewColumn *tree_column);
+int _gtk_tree_view_column_request_width     (GtkTreeViewColumn *tree_column);
 void _gtk_tree_view_column_allocate         (GtkTreeViewColumn *tree_column,
                                             int                x_offset,
                                             int                width,
@@ -111,13 +111,13 @@ GtkCellRenderer  *_gtk_tree_view_column_get_edited_cell  (GtkTreeViewColumn  *co
 GtkCellRenderer  *_gtk_tree_view_column_get_cell_at_pos  (GtkTreeViewColumn  *column,
                                                           GdkRectangle       *cell_area,
                                                           GdkRectangle       *background_area,
-                                                          gint                x,
-                                                          gint                y);
+                                                          int                 x,
+                                                          int                 y);
 gboolean          _gtk_tree_view_column_is_blank_at_pos  (GtkTreeViewColumn  *column,
                                                           GdkRectangle       *cell_area,
                                                           GdkRectangle       *background_area,
-                                                          gint                x,
-                                                          gint                y);
+                                                          int                 x,
+                                                          int                 y);
 
 void             gtk_tree_view_column_cell_snapshot     (GtkTreeViewColumn  *tree_column,
                                                          GtkSnapshot        *snapshot,
@@ -130,9 +130,9 @@ void                  _gtk_tree_view_column_cell_set_dirty   (GtkTreeViewColumn  *tree_column,
 gboolean          _gtk_tree_view_column_cell_get_dirty   (GtkTreeViewColumn  *tree_column);
 
 void              _gtk_tree_view_column_push_padding          (GtkTreeViewColumn  *column,
-                                                              gint                padding);
-gint              _gtk_tree_view_column_get_requested_width   (GtkTreeViewColumn  *column);
-gint              _gtk_tree_view_column_get_drag_x            (GtkTreeViewColumn  *column);
+                                                              int                 padding);
+int               _gtk_tree_view_column_get_requested_width   (GtkTreeViewColumn  *column);
+int               _gtk_tree_view_column_get_drag_x            (GtkTreeViewColumn  *column);
 GtkCellAreaContext *_gtk_tree_view_column_get_context         (GtkTreeViewColumn  *column);
 gboolean         _gtk_tree_view_column_coords_in_resize_rect  (GtkTreeViewColumn *column,
                                                                double             x,
index 0aa90affe12c39ce08874189d734b78fcfd03732..51fea707078e59e3e4eceb7d8bd33829733b220d 100644 (file)
@@ -20,7 +20,7 @@
 #include "gtkdebug.h"
 
 static GtkTreeRBNode *gtk_tree_rbnode_new                (GtkTreeRBTree *tree,
-                                                          gint           height);
+                                                          int            height);
 static void        gtk_tree_rbnode_free               (GtkTreeRBNode *node);
 static void        gtk_tree_rbnode_rotate_left        (GtkTreeRBTree *tree,
                                                        GtkTreeRBNode *node);
@@ -57,7 +57,7 @@ gtk_tree_rbtree_is_nil (GtkTreeRBNode *node)
 
 static GtkTreeRBNode *
 gtk_tree_rbnode_new (GtkTreeRBTree *tree,
-                     gint           height)
+                     int            height)
 {
   GtkTreeRBNode *node = g_slice_new (GtkTreeRBNode);
 
@@ -94,7 +94,7 @@ static void
 gtk_tree_rbnode_rotate_left (GtkTreeRBTree *tree,
                              GtkTreeRBNode *node)
 {
-  gint node_height, right_height;
+  int node_height, right_height;
   GtkTreeRBNode *right;
 
   g_return_if_fail (!gtk_tree_rbtree_is_nil (node));
@@ -142,7 +142,7 @@ static void
 gtk_tree_rbnode_rotate_right (GtkTreeRBTree *tree,
                               GtkTreeRBNode *node)
 {
-  gint node_height, left_height;
+  int node_height, left_height;
   GtkTreeRBNode *left;
 
   g_return_if_fail (!gtk_tree_rbtree_is_nil (node));
@@ -429,7 +429,7 @@ gtk_tree_rbtree_remove (GtkTreeRBTree *tree)
 GtkTreeRBNode *
 gtk_tree_rbtree_insert_after (GtkTreeRBTree *tree,
                               GtkTreeRBNode *current,
-                              gint           height,
+                              int            height,
                               gboolean       valid)
 {
   GtkTreeRBNode *node;
@@ -504,7 +504,7 @@ gtk_tree_rbtree_insert_after (GtkTreeRBTree *tree,
 GtkTreeRBNode *
 gtk_tree_rbtree_insert_before (GtkTreeRBTree *tree,
                                GtkTreeRBNode *current,
-                               gint           height,
+                               int            height,
                                gboolean       valid)
 {
   GtkTreeRBNode *node;
@@ -579,7 +579,7 @@ gtk_tree_rbtree_insert_before (GtkTreeRBTree *tree,
 
 GtkTreeRBNode *
 gtk_tree_rbtree_find_count (GtkTreeRBTree *tree,
-                            gint           count)
+                            int            count)
 {
   GtkTreeRBNode *node;
 
@@ -602,9 +602,9 @@ gtk_tree_rbtree_find_count (GtkTreeRBTree *tree,
 void
 gtk_tree_rbtree_node_set_height (GtkTreeRBTree *tree,
                                  GtkTreeRBNode *node,
-                                 gint           height)
+                                 int            height)
 {
-  gint diff = height - GTK_TREE_RBNODE_GET_HEIGHT (node);
+  int diff = height - GTK_TREE_RBNODE_GET_HEIGHT (node);
 
   if (diff == 0)
     return;
@@ -759,7 +759,7 @@ gtk_tree_rbtree_mark_invalid (GtkTreeRBTree *tree)
 
 void
 gtk_tree_rbtree_set_fixed_height (GtkTreeRBTree *tree,
-                                  gint           height,
+                                  int            height,
                                   gboolean       mark_valid)
 {
   GtkTreeRBNode *node;
@@ -835,12 +835,12 @@ reorder_copy_node (GtkTreeRBTree *tree,
  */
 void
 gtk_tree_rbtree_reorder (GtkTreeRBTree *tree,
-                         gint          *new_order,
-                         gint           length)
+                         int           *new_order,
+                         int            length)
 {
   GtkTreeRBNode **nodes;
   GtkTreeRBNode *node;
-  gint i, j;
+  int i, j;
 
   g_return_if_fail (tree != NULL);
   g_return_if_fail (length > 0);
@@ -924,12 +924,12 @@ gtk_tree_rbtree_contains (GtkTreeRBTree *tree,
   return FALSE;
 }
 
-gint
+int
 gtk_tree_rbtree_node_find_offset (GtkTreeRBTree *tree,
                                   GtkTreeRBNode *node)
 {
   GtkTreeRBNode *last;
-  gint retval;
+  int retval;
 
   g_assert (node);
   g_assert (node->left);
@@ -993,9 +993,9 @@ gtk_tree_rbtree_node_get_index (GtkTreeRBTree *tree,
   return retval;
 }
 
-static gint
+static int
 gtk_rbtree_real_find_offset (GtkTreeRBTree  *tree,
-                             gint            height,
+                             int             height,
                              GtkTreeRBTree **new_tree,
                              GtkTreeRBNode **new_node)
 {
@@ -1055,9 +1055,9 @@ gtk_rbtree_real_find_offset (GtkTreeRBTree  *tree,
   return (height - tmp_node->left->offset);
 }
 
-gint
+int
 gtk_tree_rbtree_find_offset (GtkTreeRBTree  *tree,
-                             gint            height,
+                             int             height,
                              GtkTreeRBTree **new_tree,
                              GtkTreeRBNode **new_node)
 {
@@ -1129,7 +1129,7 @@ gtk_tree_rbtree_remove_node (GtkTreeRBTree *tree,
                              GtkTreeRBNode *node)
 {
   GtkTreeRBNode *x, *y;
-  gint y_height;
+  int y_height;
   guint y_total_count;
 
   g_return_if_fail (tree != NULL);
@@ -1207,7 +1207,7 @@ gtk_tree_rbtree_remove_node (GtkTreeRBTree *tree,
 
   if (y != node)
     {
-      gint node_height, node_total_count;
+      int node_height, node_total_count;
 
       /* We want to see how much we remove from the aggregate values.
        * This is all the children we remove plus the node's values.
@@ -1403,11 +1403,11 @@ gtk_tree_rbtree_prev_full (GtkTreeRBTree  *tree,
     }
 }
 
-gint
+int
 gtk_tree_rbtree_get_depth (GtkTreeRBTree *tree)
 {
   GtkTreeRBTree *tmp_tree;
-  gint depth = 0;
+  int depth = 0;
 
   tmp_tree = tree->parent_tree;
   while (tmp_tree)
@@ -1543,11 +1543,11 @@ count_total (GtkTreeRBTree *tree,
   return res;
 }
 
-static gint
+static int
 _count_nodes (GtkTreeRBTree *tree,
               GtkTreeRBNode *node)
 {
-  gint res;
+  int res;
   if (gtk_tree_rbtree_is_nil (node))
     return 0;
 
@@ -1566,7 +1566,7 @@ static void
 gtk_tree_rbtree_test_height (GtkTreeRBTree *tree,
                              GtkTreeRBNode *node)
 {
-  gint computed_offset = 0;
+  int computed_offset = 0;
 
   /* This whole test is sort of a useless truism. */
 
@@ -1595,7 +1595,7 @@ gtk_tree_rbtree_test_height (GtkTreeRBTree *tree,
 static void
 gtk_tree_rbtree_test_dirty (GtkTreeRBTree *tree,
                             GtkTreeRBNode *node,
-                            gint           expected_dirtyness)
+                            int            expected_dirtyness)
 {
   g_assert (node);
 
@@ -1701,9 +1701,9 @@ static void
 gtk_tree_rbtree_debug_spew_helper (GtkTreeRBTree *tree,
                                    GtkTreeRBNode *node,
                                    GString       *s,
-                                   gint           depth)
+                                   int            depth)
 {
-  gint i;
+  int i;
   for (i = 0; i < depth; i++)
     g_string_append (s, "\t");
 
index 3dece561f5f6cbd430134e6982fd5155c21d10b3..f998be27b6be5c91ae633cd75d8fd99406a7f546 100644 (file)
@@ -66,7 +66,7 @@ struct _GtkTreeRBNode
   /* count is the number of nodes beneath us, plus 1 for ourselves.
    * i.e. node->left->count + node->right->count + 1
    */
-  gint count;
+  int count;
 
   GtkTreeRBNode *left;
   GtkTreeRBNode *right;
@@ -83,7 +83,7 @@ struct _GtkTreeRBNode
    * of all trees in ->children, iff children exists because
    * the thing is expanded.
    */
-  gint offset;
+  int offset;
 
   /* Child trees */
   GtkTreeRBTree *children;
@@ -104,25 +104,25 @@ void            gtk_tree_rbtree_remove                  (GtkTreeRBTree
 void            gtk_tree_rbtree_destroy                 (GtkTreeRBTree                 *tree);
 GtkTreeRBNode * gtk_tree_rbtree_insert_before           (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node,
-                                                         gint                           height,
+                                                         int                            height,
                                                          gboolean                       valid);
 GtkTreeRBNode * gtk_tree_rbtree_insert_after            (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node,
-                                                         gint                           height,
+                                                         int                            height,
                                                          gboolean                       valid);
 void            gtk_tree_rbtree_remove_node             (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node);
 gboolean        gtk_tree_rbtree_is_nil                  (GtkTreeRBNode                 *node);
 void            gtk_tree_rbtree_reorder                 (GtkTreeRBTree                 *tree,
-                                                         gint                          *new_order,
-                                                         gint                           length);
+                                                         int                           *new_order,
+                                                         int                            length);
 gboolean        gtk_tree_rbtree_contains                (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBTree                 *potential_child);
 GtkTreeRBNode * gtk_tree_rbtree_find_count              (GtkTreeRBTree                 *tree,
-                                                         gint                           count);
+                                                         int                            count);
 void            gtk_tree_rbtree_node_set_height         (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node,
-                                                         gint                           height);
+                                                         int                            height);
 void            gtk_tree_rbtree_node_mark_invalid       (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node);
 void            gtk_tree_rbtree_node_mark_valid         (GtkTreeRBTree                 *tree,
@@ -130,9 +130,9 @@ void            gtk_tree_rbtree_node_mark_valid         (GtkTreeRBTree
 void            gtk_tree_rbtree_column_invalid          (GtkTreeRBTree                 *tree);
 void            gtk_tree_rbtree_mark_invalid            (GtkTreeRBTree                 *tree);
 void            gtk_tree_rbtree_set_fixed_height        (GtkTreeRBTree                 *tree,
-                                                         gint                           height,
+                                                         int                            height,
                                                          gboolean                       mark_valid);
-gint            gtk_tree_rbtree_node_find_offset        (GtkTreeRBTree                 *tree,
+int             gtk_tree_rbtree_node_find_offset        (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node);
 guint           gtk_tree_rbtree_node_get_index          (GtkTreeRBTree                 *tree,
                                                          GtkTreeRBNode                 *node);
@@ -140,8 +140,8 @@ gboolean        gtk_tree_rbtree_find_index              (GtkTreeRBTree
                                                          guint                          index,
                                                          GtkTreeRBTree                **new_tree,
                                                          GtkTreeRBNode                **new_node);
-gint            gtk_tree_rbtree_find_offset             (GtkTreeRBTree                 *tree,
-                                                         gint                           offset,
+int             gtk_tree_rbtree_find_offset             (GtkTreeRBTree                 *tree,
+                                                         int                            offset,
                                                          GtkTreeRBTree                **new_tree,
                                                          GtkTreeRBNode                **new_node);
 void            gtk_tree_rbtree_traverse                (GtkTreeRBTree                 *tree,
@@ -163,7 +163,7 @@ void            gtk_tree_rbtree_prev_full               (GtkTreeRBTree
                                                          GtkTreeRBTree                **new_tree,
                                                          GtkTreeRBNode                **new_node);
 
-gint            gtk_tree_rbtree_get_depth               (GtkTreeRBTree                 *tree);
+int             gtk_tree_rbtree_get_depth               (GtkTreeRBTree                 *tree);
 
 
 G_END_DECLS
index 89739be696722e26d1cb7a50bf832b444d6f575f..fc1e27039bf56d1c23495adc7f78b2541c0e7430 100644 (file)
@@ -82,9 +82,9 @@ struct _GtkTreeSelectionClass
 };
 
 static void gtk_tree_selection_finalize          (GObject               *object);
-static gint gtk_tree_selection_real_select_all   (GtkTreeSelection      *selection);
-static gint gtk_tree_selection_real_unselect_all (GtkTreeSelection      *selection);
-static gint gtk_tree_selection_real_select_node  (GtkTreeSelection      *selection,
+static int  gtk_tree_selection_real_select_all   (GtkTreeSelection      *selection);
+static int  gtk_tree_selection_real_unselect_all (GtkTreeSelection      *selection);
+static int  gtk_tree_selection_real_select_node  (GtkTreeSelection      *selection,
                                                  GtkTreeRBTree         *tree,
                                                  GtkTreeRBNode         *node,
                                                  gboolean               select);
@@ -318,7 +318,7 @@ gtk_tree_selection_set_mode (GtkTreeSelection *selection,
     {
       GtkTreeRBTree *tree = NULL;
       GtkTreeRBNode *node = NULL;
-      gint selected = FALSE;
+      int selected = FALSE;
       GtkTreePath *anchor_path = NULL;
 
       anchor_path = _gtk_tree_view_get_anchor_path (selection->tree_view);
@@ -634,7 +634,7 @@ gtk_tree_selection_count_selected_rows_helper (GtkTreeRBTree *tree,
                                                GtkTreeRBNode *node,
                                                gpointer       data)
 {
-  gint *count = (gint *)data;
+  int *count = (int *)data;
 
   g_return_if_fail (node != NULL);
 
@@ -655,10 +655,10 @@ gtk_tree_selection_count_selected_rows_helper (GtkTreeRBTree *tree,
  *
  * Returns: The number of rows selected.
  **/
-gint
+int
 gtk_tree_selection_count_selected_rows (GtkTreeSelection *selection)
 {
-  gint count = 0;
+  int count = 0;
   GtkTreeRBTree *tree;
 
   g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), 0);
@@ -1044,7 +1044,7 @@ gtk_tree_selection_iter_is_selected (GtkTreeSelection *selection,
 /* Wish I was in python, right now... */
 struct _TempTuple {
   GtkTreeSelection *selection;
-  gint dirty;
+  int dirty;
 };
 
 static void
@@ -1070,7 +1070,7 @@ select_all_helper (GtkTreeRBTree  *tree,
 /* We have a real_{un,}select_all function that doesn't emit the signal, so we
  * can use it in other places without fear of the signal being emitted.
  */
-static gint
+static int
 gtk_tree_selection_real_select_all (GtkTreeSelection *selection)
 {
   struct _TempTuple *tuple;
@@ -1230,9 +1230,9 @@ enum
   RANGE_UNSELECT
 };
 
-static gint
+static int
 gtk_tree_selection_real_modify_range (GtkTreeSelection *selection,
-                                      gint              mode,
+                                      int               mode,
                                      GtkTreePath      *start_path,
                                      GtkTreePath      *end_path)
 {
@@ -1412,8 +1412,8 @@ _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
                                           GtkTreeSelectMode mode,
                                           gboolean          override_browse_mode)
 {
-  gint flags;
-  gint dirty = FALSE;
+  int flags;
+  int dirty = FALSE;
   GtkTreePath *anchor_path = NULL;
 
   if (selection->type == GTK_SELECTION_NONE)
@@ -1535,7 +1535,7 @@ _gtk_tree_selection_emit_changed (GtkTreeSelection *selection)
 /* NOTE: Any {un,}selection ever done _MUST_ be done through this function!
  */
 
-static gint
+static int
 gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
                                      GtkTreeRBTree    *tree,
                                      GtkTreeRBNode    *node,
index efff9130ec7e4ef92f366b8a226560e72364ef9d..351b1a665ac2a25cf2e82f9476d2eb561ef9895f 100644 (file)
@@ -99,7 +99,7 @@ GDK_AVAILABLE_IN_ALL
 GList *          gtk_tree_selection_get_selected_rows   (GtkTreeSelection            *selection,
                                                          GtkTreeModel               **model);
 GDK_AVAILABLE_IN_ALL
-gint             gtk_tree_selection_count_selected_rows (GtkTreeSelection            *selection);
+int              gtk_tree_selection_count_selected_rows (GtkTreeSelection            *selection);
 GDK_AVAILABLE_IN_ALL
 void             gtk_tree_selection_selected_foreach    (GtkTreeSelection            *selection,
                                                         GtkTreeSelectionForeachFunc  func,
index 0a2c010253e45fdb5f6c257903c5b4e813462175..585eb8b448bc7690057a714c25b9a936cebc7597 100644 (file)
@@ -122,7 +122,7 @@ gtk_tree_sortable_sort_column_changed (GtkTreeSortable *sortable)
  **/
 gboolean
 gtk_tree_sortable_get_sort_column_id (GtkTreeSortable  *sortable,
-                                     gint             *sort_column_id,
+                                     int              *sort_column_id,
                                      GtkSortType      *order)
 {
   GtkTreeSortableIface *iface;
@@ -155,7 +155,7 @@ gtk_tree_sortable_get_sort_column_id (GtkTreeSortable  *sortable,
  */
 void
 gtk_tree_sortable_set_sort_column_id (GtkTreeSortable  *sortable,
-                                     gint              sort_column_id,
+                                     int               sort_column_id,
                                      GtkSortType       order)
 {
   GtkTreeSortableIface *iface;
@@ -184,7 +184,7 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable  *sortable,
  */
 void
 gtk_tree_sortable_set_sort_func (GtkTreeSortable        *sortable,
-                                gint                    sort_column_id,
+                                int                     sort_column_id,
                                 GtkTreeIterCompareFunc  sort_func,
                                 gpointer                user_data,
                                 GDestroyNotify          destroy)
index bb49682698e3d1139e57c06a450a4db35c3f60d3..a0579829daf2fd9f234e56b5fd55ba397bcfdd61 100644 (file)
@@ -80,10 +80,10 @@ typedef struct _GtkTreeSortableIface GtkTreeSortableIface;
  * Returns: a negative integer, zero or a positive integer depending on whether
  *   @a sorts before, with or after @b
  */
-typedef gint (* GtkTreeIterCompareFunc) (GtkTreeModel *model,
-                                        GtkTreeIter  *a,
-                                        GtkTreeIter  *b,
-                                        gpointer      user_data);
+typedef int (* GtkTreeIterCompareFunc) (GtkTreeModel *model,
+                                       GtkTreeIter  *a,
+                                       GtkTreeIter  *b,
+                                       gpointer      user_data);
 
 
 /**
@@ -113,13 +113,13 @@ struct _GtkTreeSortableIface
 
   /* virtual table */
   gboolean (* get_sort_column_id)    (GtkTreeSortable        *sortable,
-                                     gint                   *sort_column_id,
+                                     int                    *sort_column_id,
                                      GtkSortType            *order);
   void     (* set_sort_column_id)    (GtkTreeSortable        *sortable,
-                                     gint                    sort_column_id,
+                                     int                     sort_column_id,
                                      GtkSortType             order);
   void     (* set_sort_func)         (GtkTreeSortable        *sortable,
-                                     gint                    sort_column_id,
+                                     int                     sort_column_id,
                                      GtkTreeIterCompareFunc  sort_func,
                                      gpointer                user_data,
                                      GDestroyNotify          destroy);
@@ -138,15 +138,15 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_sort_column_changed   (GtkTreeSortable        *sortable);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_tree_sortable_get_sort_column_id    (GtkTreeSortable        *sortable,
-                                                 gint                   *sort_column_id,
+                                                 int                    *sort_column_id,
                                                  GtkSortType            *order);
 GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_set_sort_column_id    (GtkTreeSortable        *sortable,
-                                                 gint                    sort_column_id,
+                                                 int                     sort_column_id,
                                                  GtkSortType             order);
 GDK_AVAILABLE_IN_ALL
 void     gtk_tree_sortable_set_sort_func         (GtkTreeSortable        *sortable,
-                                                 gint                    sort_column_id,
+                                                 int                     sort_column_id,
                                                  GtkTreeIterCompareFunc  sort_func,
                                                  gpointer                user_data,
                                                  GDestroyNotify          destroy);
index ce69dc187b64663289ba44417b53ef6e712d872b..1c90e518f3a7f36c5ee644ef636c774167e2ff4e 100644 (file)
 
 struct _GtkTreeStorePrivate
 {
-  gint stamp;
+  int stamp;
   GtkSortType order;
   gpointer root;
   gpointer last;
-  gint n_columns;
-  gint sort_column_id;
+  int n_columns;
+  int sort_column_id;
   GList *sort_list;
   GType *column_headers;
   GtkTreeIterCompareFunc default_sort_func;
@@ -89,9 +89,9 @@ static void         gtk_tree_store_sortable_init   (GtkTreeSortableIface   *ifac
 static void         gtk_tree_store_buildable_init  (GtkBuildableIface      *iface);
 static void         gtk_tree_store_finalize        (GObject           *object);
 static GtkTreeModelFlags gtk_tree_store_get_flags  (GtkTreeModel      *tree_model);
-static gint         gtk_tree_store_get_n_columns   (GtkTreeModel      *tree_model);
+static int          gtk_tree_store_get_n_columns   (GtkTreeModel      *tree_model);
 static GType        gtk_tree_store_get_column_type (GtkTreeModel      *tree_model,
-                                                   gint               index);
+                                                   int                index);
 static gboolean     gtk_tree_store_get_iter        (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
                                                    GtkTreePath       *path);
@@ -99,7 +99,7 @@ static GtkTreePath *gtk_tree_store_get_path        (GtkTreeModel      *tree_mode
                                                    GtkTreeIter       *iter);
 static void         gtk_tree_store_get_value       (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
-                                                   gint               column,
+                                                   int                column,
                                                    GValue            *value);
 static gboolean     gtk_tree_store_iter_next       (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter);
@@ -110,21 +110,21 @@ static gboolean     gtk_tree_store_iter_children   (GtkTreeModel      *tree_mode
                                                    GtkTreeIter       *parent);
 static gboolean     gtk_tree_store_iter_has_child  (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter);
-static gint         gtk_tree_store_iter_n_children (GtkTreeModel      *tree_model,
+static int          gtk_tree_store_iter_n_children (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter);
 static gboolean     gtk_tree_store_iter_nth_child  (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
                                                    GtkTreeIter       *parent,
-                                                   gint               n);
+                                                   int                n);
 static gboolean     gtk_tree_store_iter_parent     (GtkTreeModel      *tree_model,
                                                    GtkTreeIter       *iter,
                                                    GtkTreeIter       *child);
 
 
 static void gtk_tree_store_set_n_columns   (GtkTreeStore *tree_store,
-                                           gint          n_columns);
+                                           int           n_columns);
 static void gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
-                                           gint          column,
+                                           int           column,
                                            GType         type);
 
 static void gtk_tree_store_increment_stamp (GtkTreeStore  *tree_store);
@@ -150,16 +150,16 @@ static gboolean gtk_tree_store_row_drop_possible  (GtkTreeDragDest   *drag_dest,
 static void     gtk_tree_store_sort                    (GtkTreeStore           *tree_store);
 static void     gtk_tree_store_sort_iter_changed       (GtkTreeStore           *tree_store,
                                                        GtkTreeIter            *iter,
-                                                       gint                    column,
+                                                       int                     column,
                                                        gboolean                emit_signal);
 static gboolean gtk_tree_store_get_sort_column_id      (GtkTreeSortable        *sortable,
-                                                       gint                   *sort_column_id,
+                                                       int                    *sort_column_id,
                                                        GtkSortType            *order);
 static void     gtk_tree_store_set_sort_column_id      (GtkTreeSortable        *sortable,
-                                                       gint                    sort_column_id,
+                                                       int                     sort_column_id,
                                                        GtkSortType             order);
 static void     gtk_tree_store_set_sort_func           (GtkTreeSortable        *sortable,
-                                                       gint                    sort_column_id,
+                                                       int                     sort_column_id,
                                                        GtkTreeIterCompareFunc  func,
                                                        gpointer                data,
                                                        GDestroyNotify          destroy);
@@ -310,17 +310,17 @@ gtk_tree_store_init (GtkTreeStore *tree_store)
  *
  * As an example, `gtk_tree_store_new (3, G_TYPE_INT, G_TYPE_STRING,
  * GDK_TYPE_TEXTURE);` will create a new #GtkTreeStore with three columns, of type
- * #gint, #gchararray, and #GdkTexture respectively.
+ * #int, #gchararray, and #GdkTexture respectively.
  *
  * Returns: a new #GtkTreeStore
  **/
 GtkTreeStore *
-gtk_tree_store_new (gint n_columns,
+gtk_tree_store_new (int n_columns,
                               ...)
 {
   GtkTreeStore *retval;
   va_list args;
-  gint i;
+  int i;
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
@@ -355,11 +355,11 @@ gtk_tree_store_new (gint n_columns,
  * Returns: (transfer full): a new #GtkTreeStore
  **/
 GtkTreeStore *
-gtk_tree_store_newv (gint   n_columns,
+gtk_tree_store_newv (int    n_columns,
                     GType *types)
 {
   GtkTreeStore *retval;
-  gint i;
+  int i;
 
   g_return_val_if_fail (n_columns > 0, NULL);
 
@@ -394,10 +394,10 @@ gtk_tree_store_newv (gint   n_columns,
  **/
 void
 gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
-                                gint          n_columns,
+                                int           n_columns,
                                 GType        *types)
 {
-  gint i;
+  int i;
 
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
   g_return_if_fail (tree_store->priv->columns_dirty == 0);
@@ -416,7 +416,7 @@ gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
 
 static void
 gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
-                             gint          n_columns)
+                             int           n_columns)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
   int i;
@@ -449,7 +449,7 @@ gtk_tree_store_set_n_columns (GtkTreeStore *tree_store,
  **/
 static void
 gtk_tree_store_set_column_type (GtkTreeStore *tree_store,
-                               gint          column,
+                               int           column,
                                GType         type)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
@@ -510,7 +510,7 @@ gtk_tree_store_get_flags (GtkTreeModel *tree_model)
   return GTK_TREE_MODEL_ITERS_PERSIST;
 }
 
-static gint
+static int
 gtk_tree_store_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
@@ -523,7 +523,7 @@ gtk_tree_store_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 gtk_tree_store_get_column_type (GtkTreeModel *tree_model,
-                               gint          index)
+                               int           index)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GtkTreeStorePrivate *priv = tree_store->priv;
@@ -543,8 +543,8 @@ gtk_tree_store_get_iter (GtkTreeModel *tree_model,
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GtkTreeStorePrivate *priv = tree_store->priv;
   GtkTreeIter parent;
-  gint *indices;
-  gint depth, i;
+  int *indices;
+  int depth, i;
 
   priv->columns_dirty = TRUE;
 
@@ -583,7 +583,7 @@ gtk_tree_store_get_path (GtkTreeModel *tree_model,
   GtkTreeStorePrivate *priv = tree_store->priv;
   GtkTreePath *retval;
   GNode *tmp_node;
-  gint i = 0;
+  int i = 0;
 
   g_return_val_if_fail (iter->user_data != NULL, NULL);
   g_return_val_if_fail (iter->stamp == priv->stamp, NULL);
@@ -643,13 +643,13 @@ gtk_tree_store_get_path (GtkTreeModel *tree_model,
 static void
 gtk_tree_store_get_value (GtkTreeModel *tree_model,
                          GtkTreeIter  *iter,
-                         gint          column,
+                         int           column,
                          GValue       *value)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GtkTreeStorePrivate *priv = tree_store->priv;
   GtkTreeDataList *list;
-  gint tmp_column = column;
+  int tmp_column = column;
 
   g_return_if_fail (column < priv->n_columns);
   g_return_if_fail (VALID_ITER (iter, tree_store));
@@ -748,12 +748,12 @@ gtk_tree_store_iter_has_child (GtkTreeModel *tree_model,
   return G_NODE (iter->user_data)->children != NULL;
 }
 
-static gint
+static int
 gtk_tree_store_iter_n_children (GtkTreeModel *tree_model,
                                GtkTreeIter  *iter)
 {
   GNode *node;
-  gint i = 0;
+  int i = 0;
 
   g_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0);
 
@@ -775,7 +775,7 @@ static gboolean
 gtk_tree_store_iter_nth_child (GtkTreeModel *tree_model,
                               GtkTreeIter  *iter,
                               GtkTreeIter  *parent,
-                              gint          n)
+                              int           n)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) tree_model;
   GtkTreeStorePrivate *priv = tree_store->priv;
@@ -838,14 +838,14 @@ gtk_tree_store_iter_parent (GtkTreeModel *tree_model,
 static gboolean
 gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
                               GtkTreeIter  *iter,
-                              gint          column,
+                              int           column,
                               GValue       *value,
                               gboolean      sort)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
-  gint old_column = column;
+  int old_column = column;
   GValue real_value = G_VALUE_INIT;
   gboolean converted = FALSE;
   gboolean retval = FALSE;
@@ -946,7 +946,7 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
 void
 gtk_tree_store_set_value (GtkTreeStore *tree_store,
                          GtkTreeIter  *iter,
-                         gint          column,
+                         int           column,
                          GValue       *value)
 {
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
@@ -995,12 +995,12 @@ gtk_tree_store_set_vector_internal (GtkTreeStore *tree_store,
                                    GtkTreeIter  *iter,
                                    gboolean     *emit_signal,
                                    gboolean     *maybe_need_sort,
-                                   gint         *columns,
+                                   int          *columns,
                                    GValue       *values,
-                                   gint          n_values)
+                                   int           n_values)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
-  gint i;
+  int i;
   GtkTreeIterCompareFunc func = NULL;
 
   func = gtk_tree_store_get_compare_func (tree_store);
@@ -1027,10 +1027,10 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
                                     va_list       var_args)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
-  gint column;
+  int column;
   GtkTreeIterCompareFunc func = NULL;
 
-  column = va_arg (var_args, gint);
+  column = va_arg (var_args, int);
 
   func = gtk_tree_store_get_compare_func (tree_store);
   if (func != _gtk_tree_data_list_compare_func)
@@ -1072,7 +1072,7 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
 
       g_value_unset (&value);
 
-      column = va_arg (var_args, gint);
+      column = va_arg (var_args, int);
     }
 }
 
@@ -1092,9 +1092,9 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store,
 void
 gtk_tree_store_set_valuesv (GtkTreeStore *tree_store,
                            GtkTreeIter  *iter,
-                           gint         *columns,
+                           int          *columns,
                            GValue       *values,
-                           gint          n_values)
+                           int           n_values)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
   gboolean emit_signal = FALSE;
@@ -1277,7 +1277,7 @@ void
 gtk_tree_store_insert (GtkTreeStore *tree_store,
                       GtkTreeIter  *iter,
                       GtkTreeIter  *parent,
-                      gint          position)
+                      int           position)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
   GtkTreePath *path;
@@ -1513,7 +1513,7 @@ void
 gtk_tree_store_insert_with_values (GtkTreeStore *tree_store,
                                   GtkTreeIter  *iter,
                                   GtkTreeIter  *parent,
-                                  gint          position,
+                                  int           position,
                                   ...)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
@@ -1590,10 +1590,10 @@ void
 gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
                                    GtkTreeIter  *iter,
                                    GtkTreeIter  *parent,
-                                   gint          position,
-                                   gint         *columns,
+                                   int           position,
+                                   int          *columns,
                                    GValue       *values,
-                                   gint          n_values)
+                                   int           n_values)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
   GtkTreePath *path;
@@ -1801,7 +1801,7 @@ gtk_tree_store_is_ancestor (GtkTreeStore *tree_store,
  * 
  * Returns: The depth of @iter
  **/
-gint
+int
 gtk_tree_store_iter_depth (GtkTreeStore *tree_store,
                           GtkTreeIter  *iter)
 {
@@ -1978,7 +1978,7 @@ copy_node_data (GtkTreeStore *tree_store,
   GtkTreeDataList *copy_prev = NULL;
   GtkTreeDataList *copy_iter = NULL;
   GtkTreePath *path;
-  gint col;
+  int col;
 
   col = 0;
   while (dl)
@@ -2205,12 +2205,12 @@ gtk_tree_store_row_drop_possible (GtkTreeDragDest *drag_dest,
 /* Sorting and reordering */
 typedef struct _SortTuple
 {
-  gint offset;
+  int offset;
   GNode *node;
 } SortTuple;
 
 /* Reordering */
-static gint
+static int
 gtk_tree_store_reorder_func (gconstpointer a,
                             gconstpointer b,
                             gpointer      user_data)
@@ -2244,9 +2244,9 @@ gtk_tree_store_reorder_func (gconstpointer a,
 void
 gtk_tree_store_reorder (GtkTreeStore *tree_store,
                        GtkTreeIter  *parent,
-                       gint         *new_order)
+                       int          *new_order)
 {
-  gint i, length = 0;
+  int i, length = 0;
   GNode *level, *node;
   GtkTreePath *path;
   SortTuple *sort_array;
@@ -2334,7 +2334,7 @@ gtk_tree_store_swap (GtkTreeStore *tree_store,
 {
   GNode *tmp, *node_a, *node_b, *parent_node;
   GNode *a_prev, *a_next, *b_prev, *b_next;
-  gint i, a_count, b_count, length, *order;
+  int i, a_count, b_count, length, *order;
   GtkTreePath *path_a, *path_b;
   GtkTreeIter parent;
 
@@ -2443,7 +2443,7 @@ gtk_tree_store_swap (GtkTreeStore *tree_store,
   node_b->next = a_next;
 
   /* emit signal */
-  order = g_new (gint, length);
+  order = g_new (int, length);
   for (i = 0; i < length; i++)
     if (i == a_count)
       order[i] = b_count;
@@ -2470,10 +2470,10 @@ gtk_tree_store_move (GtkTreeStore *tree_store,
                     gboolean      before)
 {
   GNode *parent, *node, *a, *b, *tmp, *tmp_a, *tmp_b;
-  gint old_pos, new_pos, length, i, *order;
+  int old_pos, new_pos, length, i, *order;
   GtkTreePath *path = NULL, *tmppath, *pos_path = NULL;
   GtkTreeIter parent_iter, dst_a, dst_b;
-  gint depth = 0;
+  int depth = 0;
   gboolean handle_b = TRUE;
 
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
@@ -2729,7 +2729,7 @@ gtk_tree_store_move (GtkTreeStore *tree_store,
         new_pos++;
     }
 
-  order = g_new (gint, length);
+  order = g_new (int, length);
   if (new_pos > old_pos)
     {
       for (i = 0; i < length; i++)
@@ -2819,7 +2819,7 @@ gtk_tree_store_move_after (GtkTreeStore *tree_store,
 }
 
 /* Sorting */
-static gint
+static int
 gtk_tree_store_compare_func (gconstpointer a,
                             gconstpointer b,
                             gpointer      user_data)
@@ -2833,7 +2833,7 @@ gtk_tree_store_compare_func (gconstpointer a,
 
   GtkTreeIter iter_a;
   GtkTreeIter iter_b;
-  gint retval;
+  int retval;
 
   if (priv->sort_column_id != -1)
     {
@@ -2883,9 +2883,9 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store,
   GArray *sort_array;
   GNode *node;
   GNode *tmp_node;
-  gint list_length;
-  gint i;
-  gint *new_order;
+  int list_length;
+  int i;
+  int *new_order;
   GtkTreePath *path;
 
   node = parent->children;
@@ -2929,7 +2929,7 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store,
   parent->children = g_array_index (sort_array, SortTuple, 0).node;
 
   /* Let the world know about our new order */
-  new_order = g_new (gint, list_length);
+  new_order = g_new (int, list_length);
   for (i = 0; i < list_length; i++)
     new_order[i] = g_array_index (sort_array, SortTuple, i).offset;
 
@@ -2982,7 +2982,7 @@ gtk_tree_store_sort (GtkTreeStore *tree_store)
 static void
 gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
                                  GtkTreeIter  *iter,
-                                 gint          column,
+                                 int           column,
                                  gboolean      emit_signal)
 {
   GtkTreeStorePrivate *priv = tree_store->priv;
@@ -2991,13 +2991,13 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
   GNode *node;
   GtkTreePath *tmp_path;
   GtkTreeIter tmp_iter;
-  gint cmp_a = 0;
-  gint cmp_b = 0;
-  gint i;
-  gint old_location;
-  gint new_location;
-  gint *new_order;
-  gint length;
+  int cmp_a = 0;
+  int cmp_b = 0;
+  int i;
+  int old_location;
+  int new_location;
+  int *new_order;
+  int length;
   GtkTreeIterCompareFunc func;
   gpointer data;
 
@@ -3176,7 +3176,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
 
 static gboolean
 gtk_tree_store_get_sort_column_id (GtkTreeSortable  *sortable,
-                                  gint             *sort_column_id,
+                                  int              *sort_column_id,
                                   GtkSortType      *order)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
@@ -3196,7 +3196,7 @@ gtk_tree_store_get_sort_column_id (GtkTreeSortable  *sortable,
 
 static void
 gtk_tree_store_set_sort_column_id (GtkTreeSortable  *sortable,
-                                  gint              sort_column_id,
+                                  int               sort_column_id,
                                   GtkSortType       order)
 {
   GtkTreeStore *tree_store = (GtkTreeStore *) sortable;
@@ -3235,7 +3235,7 @@ gtk_tree_store_set_sort_column_id (GtkTreeSortable  *sortable,
 
 static void
 gtk_tree_store_set_sort_func (GtkTreeSortable        *sortable,
-                             gint                    sort_column_id,
+                             int                     sort_column_id,
                              GtkTreeIterCompareFunc  func,
                              gpointer                data,
                              GDestroyNotify          destroy)
index 649dc2154bb25a6188f1791cb91ef326e91a2411..676491f3a6714fe07927024e22345dda82cc72de 100644 (file)
@@ -61,14 +61,14 @@ struct _GtkTreeStoreClass
 GDK_AVAILABLE_IN_ALL
 GType         gtk_tree_store_get_type         (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-GtkTreeStore *gtk_tree_store_new              (gint          n_columns,
+GtkTreeStore *gtk_tree_store_new              (int           n_columns,
                                               ...);
 GDK_AVAILABLE_IN_ALL
-GtkTreeStore *gtk_tree_store_newv             (gint          n_columns,
+GtkTreeStore *gtk_tree_store_newv             (int           n_columns,
                                               GType        *types);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
-                                              gint          n_columns,
+                                              int           n_columns,
                                               GType        *types);
 
 /* NOTE: use gtk_tree_model_get to get values from a GtkTreeStore */
@@ -76,7 +76,7 @@ void          gtk_tree_store_set_column_types (GtkTreeStore *tree_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_value        (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
-                                              gint          column,
+                                              int           column,
                                               GValue       *value);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set              (GtkTreeStore *tree_store,
@@ -85,9 +85,9 @@ void          gtk_tree_store_set              (GtkTreeStore *tree_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_valuesv      (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
-                                              gint         *columns,
+                                              int          *columns,
                                               GValue       *values,
-                                              gint          n_values);
+                                              int           n_values);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_set_valist       (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
@@ -99,7 +99,7 @@ GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert           (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *parent,
-                                              gint          position);
+                                              int           position);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_before    (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
@@ -114,16 +114,16 @@ GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_with_values (GtkTreeStore *tree_store,
                                                 GtkTreeIter  *iter,
                                                 GtkTreeIter  *parent,
-                                                gint          position,
+                                                int           position,
                                                 ...);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_insert_with_valuesv (GtkTreeStore *tree_store,
                                                  GtkTreeIter  *iter,
                                                  GtkTreeIter  *parent,
-                                                 gint          position,
-                                                 gint         *columns,
+                                                 int           position,
+                                                 int          *columns,
                                                  GValue       *values,
-                                                 gint          n_values);
+                                                 int           n_values);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_prepend          (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
@@ -137,7 +137,7 @@ gboolean      gtk_tree_store_is_ancestor      (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter,
                                               GtkTreeIter  *descendant);
 GDK_AVAILABLE_IN_ALL
-gint          gtk_tree_store_iter_depth       (GtkTreeStore *tree_store,
+int           gtk_tree_store_iter_depth       (GtkTreeStore *tree_store,
                                               GtkTreeIter  *iter);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_clear            (GtkTreeStore *tree_store);
@@ -147,7 +147,7 @@ gboolean      gtk_tree_store_iter_is_valid    (GtkTreeStore *tree_store,
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_reorder          (GtkTreeStore *tree_store,
                                                GtkTreeIter  *parent,
-                                               gint         *new_order);
+                                               int          *new_order);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_store_swap             (GtkTreeStore *tree_store,
                                                GtkTreeIter  *a,
index 3be5b40b818dfbe291b3edd79596686aedf63e97..7906fc906318d7a9fb372e0d78dd5f8bcbaa8990 100644 (file)
@@ -284,8 +284,8 @@ typedef enum {
 typedef struct _GtkTreeViewColumnReorder GtkTreeViewColumnReorder;
 struct _GtkTreeViewColumnReorder
 {
-  gint left_align;
-  gint right_align;
+  int left_align;
+  int right_align;
   GtkTreeViewColumn *left_column;
   GtkTreeViewColumn *right_column;
 };
@@ -327,25 +327,25 @@ typedef struct
 
   /* Container info */
   GList *children;
-  gint width;
+  int width;
 
   guint presize_handler_tick_cb;
 
   /* Adjustments */
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
-  gint           min_display_width;
-  gint           min_display_height;
+  int            min_display_width;
+  int            min_display_height;
 
   /* CSS nodes */
   GtkCssNode *header_node;
 
   /* Scroll position state keeping */
   GtkTreeRowReference *top_row;
-  gint top_row_dy;
+  int top_row_dy;
   /* dy == y pos of top_row + top_row_dy */
   /* we cache it for simplicity of the code */
-  gint dy;
+  int dy;
 
   guint validate_rows_timer;
   guint scroll_sync_timer;
@@ -353,10 +353,10 @@ typedef struct
   /* Indentation and expander layout */
   GtkTreeViewColumn *expander_column;
 
-  gint level_indentation;
+  int level_indentation;
 
   /* Key navigation (focus), selection */
-  gint cursor_offset;
+  int cursor_offset;
 
   GtkTreeRowReference *anchor;
   GtkTreeRBNode *cursor_node;
@@ -368,11 +368,11 @@ typedef struct
   GtkTreeRBNode *button_pressed_node;
   GtkTreeRBTree *button_pressed_tree;
 
-  gint press_start_x;
-  gint press_start_y;
+  int press_start_x;
+  int press_start_y;
 
-  gint event_last_x;
-  gint event_last_y;
+  int event_last_x;
+  int event_last_y;
 
   GtkTreeRBNode *prelight_node;
   GtkTreeRBTree *prelight_tree;
@@ -387,8 +387,8 @@ typedef struct
   GtkTreeSelection *selection;
 
   /* Header information */
-  gint header_height;
-  gint n_columns;
+  int header_height;
+  int n_columns;
   GList *columns;
 
   GtkTreeViewColumnDropFunc column_drop_func;
@@ -397,19 +397,19 @@ typedef struct
   GList *column_drag_info;
   GtkTreeViewColumnReorder *cur_reorder;
 
-  gint prev_width_before_expander;
+  int prev_width_before_expander;
 
   /* Scroll timeout (e.g. during dnd, rubber banding) */
   guint scroll_timeout;
 
   /* Interactive Header reordering */
   GtkTreeViewColumn *drag_column;
-  gint drag_column_x;
-  gint drag_column_y;
+  int drag_column_x;
+  int drag_column_y;
 
   /* Interactive Header Resizing */
-  gint drag_pos;
-  gint x_drag;
+  int drag_pos;
+  int x_drag;
 
   /* Row drag-and-drop */
   GtkTreeRowReference *drag_dest_row;
@@ -417,14 +417,14 @@ typedef struct
   guint open_dest_timeout;
 
   /* Rubber banding */
-  gint rubber_band_status;
-  gint rubber_band_x;
-  gint rubber_band_y;
-  gint rubber_band_extend;
-  gint rubber_band_modify;
+  int rubber_band_status;
+  int rubber_band_x;
+  int rubber_band_y;
+  int rubber_band_extend;
+  int rubber_band_modify;
 
   /* fixed height */
-  gint fixed_height;
+  int fixed_height;
 
   GtkTreeRBNode *rubber_band_start_node;
   GtkTreeRBTree *rubber_band_start_tree;
@@ -440,8 +440,8 @@ typedef struct
   gfloat scroll_to_col_align;
 
   /* Interactive search */
-  gint selected_iter;
-  gint search_column;
+  int selected_iter;
+  int search_column;
   GtkTreeViewSearchEqualFunc search_equal_func;
   gpointer search_user_data;
   GDestroyNotify search_destroy;
@@ -467,7 +467,7 @@ typedef struct
   GtkGesture *column_drag_gesture; /* Column reordering, resizing */
 
   /* Tooltip support */
-  gint tooltip_column;
+  int tooltip_column;
 
   int expander_size;
 
@@ -632,7 +632,7 @@ static void     gtk_tree_view_key_controller_key_released (GtkEventControllerKey
 static void     gtk_tree_view_focus_controller_focus_out  (GtkEventController    *focus,
                                                            GtkTreeView           *tree_view);
 
-static gint     gtk_tree_view_focus                (GtkWidget        *widget,
+static int      gtk_tree_view_focus                (GtkWidget        *widget,
                                                    GtkDirectionType  direction);
 static gboolean gtk_tree_view_grab_focus           (GtkWidget        *widget);
 static void     gtk_tree_view_css_changed          (GtkWidget        *widget,
@@ -668,7 +668,7 @@ static void     gtk_tree_view_drag_data_received          (GObject
 /* tree_model signals */
 static gboolean gtk_tree_view_real_move_cursor            (GtkTreeView     *tree_view,
                                                           GtkMovementStep  step,
-                                                          gint             count,
+                                                          int              count,
                                                            gboolean         extend,
                                                            gboolean         modify);
 static gboolean gtk_tree_view_real_select_all             (GtkTreeView     *tree_view);
@@ -699,7 +699,7 @@ static void gtk_tree_view_row_deleted                     (GtkTreeModel    *mode
 static void gtk_tree_view_rows_reordered                  (GtkTreeModel    *model,
                                                           GtkTreePath     *parent,
                                                           GtkTreeIter     *iter,
-                                                          gint            *new_order,
+                                                          int             *new_order,
                                                           gpointer         data);
 
 /* Incremental reflow */
@@ -716,7 +716,7 @@ static void     install_presize_handler  (GtkTreeView *tree_view);
 static void     install_scroll_sync_handler (GtkTreeView *tree_view);
 static void     gtk_tree_view_set_top_row   (GtkTreeView *tree_view,
                                             GtkTreePath *path,
-                                            gint         offset);
+                                            int          offset);
 static void    gtk_tree_view_dy_to_top_row (GtkTreeView *tree_view);
 static void     gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view);
 static void     invalidate_empty_focus      (GtkTreeView *tree_view);
@@ -730,8 +730,8 @@ static void     gtk_tree_view_add_move_binding               (GtkWidgetClass
                                                              guint               modmask,
                                                              gboolean            add_shifted_binding,
                                                              GtkMovementStep     step,
-                                                             gint                count);
-static gint     gtk_tree_view_unref_and_check_selection_tree (GtkTreeView        *tree_view,
+                                                             int                 count);
+static int      gtk_tree_view_unref_and_check_selection_tree (GtkTreeView        *tree_view,
                                                              GtkTreeRBTree      *tree);
 static void     gtk_tree_view_snapshot_arrow                 (GtkTreeView        *tree_view,
                                                               GtkSnapshot        *snapshot,
@@ -739,14 +739,14 @@ static void     gtk_tree_view_snapshot_arrow                 (GtkTreeView
                                                              GtkTreeRBNode      *node);
 static void     gtk_tree_view_get_arrow_xrange               (GtkTreeView        *tree_view,
                                                              GtkTreeRBTree      *tree,
-                                                             gint               *x1,
-                                                             gint               *x2);
+                                                             int                *x1,
+                                                             int                *x2);
 static void     gtk_tree_view_adjustment_changed             (GtkAdjustment      *adjustment,
                                                              GtkTreeView        *tree_view);
 static void     gtk_tree_view_build_tree                     (GtkTreeView        *tree_view,
                                                              GtkTreeRBTree          *tree,
                                                              GtkTreeIter        *iter,
-                                                             gint                depth,
+                                                             int                 depth,
                                                              gboolean            recurse);
 static void     gtk_tree_view_clamp_node_visible             (GtkTreeView        *tree_view,
                                                              GtkTreeRBTree      *tree,
@@ -757,13 +757,13 @@ static void     gtk_tree_view_clamp_column_visible           (GtkTreeView
 static gboolean gtk_tree_view_maybe_begin_dragging_row       (GtkTreeView        *tree_view);
 static void     gtk_tree_view_focus_to_cursor                (GtkTreeView        *tree_view);
 static void     gtk_tree_view_move_cursor_up_down            (GtkTreeView        *tree_view,
-                                                             gint                count);
+                                                             int                 count);
 static void     gtk_tree_view_move_cursor_page_up_down       (GtkTreeView        *tree_view,
-                                                             gint                count);
+                                                             int                 count);
 static void     gtk_tree_view_move_cursor_left_right         (GtkTreeView        *tree_view,
-                                                             gint                count);
+                                                             int                 count);
 static void     gtk_tree_view_move_cursor_start_end          (GtkTreeView        *tree_view,
-                                                             gint                count);
+                                                             int                 count);
 static gboolean gtk_tree_view_real_collapse_row              (GtkTreeView        *tree_view,
                                                              GtkTreePath        *path,
                                                              GtkTreeRBTree      *tree,
@@ -786,18 +786,18 @@ static void     update_prelight                              (GtkTreeView
                                                               int                 x,
                                                               int                 y);
 
-static inline gint gtk_tree_view_get_effective_header_height (GtkTreeView        *tree_view);
+static inline int gtk_tree_view_get_effective_header_height (GtkTreeView        *tree_view);
 
-static inline gint gtk_tree_view_get_cell_area_y_offset      (GtkTreeView        *tree_view,
+static inline int gtk_tree_view_get_cell_area_y_offset      (GtkTreeView        *tree_view,
                                                               GtkTreeRBTree      *tree,
                                                               GtkTreeRBNode      *node);
-static inline gint gtk_tree_view_get_cell_area_height        (GtkTreeView        *tree_view,
+static inline int gtk_tree_view_get_cell_area_height        (GtkTreeView        *tree_view,
                                                               GtkTreeRBNode      *node);
 
-static inline gint gtk_tree_view_get_row_y_offset            (GtkTreeView        *tree_view,
+static inline int gtk_tree_view_get_row_y_offset            (GtkTreeView        *tree_view,
                                                               GtkTreeRBTree      *tree,
                                                               GtkTreeRBNode      *node);
-static inline gint gtk_tree_view_get_row_height              (GtkTreeView        *tree_view,
+static inline int gtk_tree_view_get_row_height              (GtkTreeView        *tree_view,
                                                               GtkTreeRBNode      *node);
 static TreeViewDragInfo* get_info (GtkTreeView *tree_view);
 
@@ -830,7 +830,7 @@ static gboolean gtk_tree_view_search_move               (GtkWidget        *windo
                                                         GtkTreeView      *tree_view,
                                                         gboolean          up);
 static gboolean gtk_tree_view_search_equal_func         (GtkTreeModel     *model,
-                                                        gint              column,
+                                                        int               column,
                                                         const gchar      *key,
                                                         GtkTreeIter      *iter,
                                                         gpointer          search_data);
@@ -838,8 +838,8 @@ static gboolean gtk_tree_view_search_iter               (GtkTreeModel     *model
                                                         GtkTreeSelection *selection,
                                                         GtkTreeIter      *iter,
                                                         const gchar      *text,
-                                                        gint             *count,
-                                                        gint              n);
+                                                        int              *count,
+                                                        int               n);
 static void     gtk_tree_view_search_init               (GtkWidget        *entry,
                                                         GtkTreeView      *tree_view);
 static void     gtk_tree_view_put                       (GtkTreeView      *tree_view,
@@ -857,7 +857,7 @@ static gboolean gtk_tree_view_real_start_interactive_search (GtkTreeView *tree_v
 static gboolean gtk_tree_view_start_interactive_search      (GtkTreeView *tree_view);
 static GtkTreeViewColumn *gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
                                                         GtkTreeViewColumn *column,
-                                                        gint               drop_position);
+                                                        int                drop_position);
 
 /* GtkBuildable */
 static void     gtk_tree_view_buildable_add_child          (GtkBuildable      *tree_view,
@@ -885,18 +885,18 @@ static void     grab_focus_and_unset_draw_keyfocus   (GtkTreeView *tree_view);
 
 /* Gestures */
 static void gtk_tree_view_column_click_gesture_pressed (GtkGestureClick *gesture,
-                                                             gint                  n_press,
+                                                             int                   n_press,
                                                              gdouble               x,
                                                              gdouble               y,
                                                              GtkTreeView          *tree_view);
 
 static void gtk_tree_view_click_gesture_pressed        (GtkGestureClick *gesture,
-                                                             gint                  n_press,
+                                                             int                   n_press,
                                                              gdouble               x,
                                                              gdouble               y,
                                                              GtkTreeView          *tree_view);
 static void gtk_tree_view_click_gesture_released       (GtkGestureClick *gesture,
-                                                             gint                  n_press,
+                                                             int                   n_press,
                                                              gdouble               x,
                                                              gdouble               y,
                                                              GtkTreeView          *tree_view);
@@ -2303,7 +2303,7 @@ gtk_tree_view_update_height (GtkTreeView *tree_view)
     }
 }
 
-static gint
+static int
 gtk_tree_view_get_height (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
@@ -2330,7 +2330,7 @@ gtk_tree_view_measure (GtkWidget        *widget,
     {
       GList *list;
       GtkTreeViewColumn *column;
-      gint width = 0;
+      int width = 0;
 
       /* we validate some rows initially just to make sure we have some size.
        * In practice, with a lot of static lists, this should get a good width.
@@ -2390,10 +2390,10 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
   const int x_offset = - gtk_adjustment_get_value (priv->hadjustment);
   GList *list, *first_column, *last_column;
   GtkTreeViewColumn *column;
-  gint widget_width, width = 0;
-  gint extra, extra_per_column;
-  gint full_requested_width = 0;
-  gint number_of_expand_columns = 0;
+  int widget_width, width = 0;
+  int extra, extra_per_column;
+  int full_requested_width = 0;
+  int number_of_expand_columns = 0;
   gboolean rtl;
 
   for (last_column = g_list_last (priv->columns);
@@ -2441,7 +2441,7 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget)
        list != last_column->next;
        list = list->next)
     {
-      gint column_width;
+      int column_width;
 
       column = list->data;
       column_width = _gtk_tree_view_column_request_width (column);
@@ -2569,7 +2569,7 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
            * width that makes the expander move vertically.  Always updating
            * prelight status causes trouble with hover selections.
            */
-          gint width_before_expander;
+          int width_before_expander;
 
           width_before_expander = gtk_tree_view_calculate_width_before_expander (tree_view);
 
@@ -2758,12 +2758,12 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture,
   GdkEventSequence *sequence;
   GdkModifierType modifiers;
   GdkEvent *event;
-  gint new_y, y_offset;
-  gint bin_x, bin_y;
+  int new_y, y_offset;
+  int bin_x, bin_y;
   GtkTreePath *path;
   GtkTreeRBNode *node;
   GtkTreeRBTree *tree;
-  gint depth;
+  int depth;
   guint button;
   GList *list;
   gboolean rtl;
@@ -2880,7 +2880,7 @@ gtk_tree_view_click_gesture_pressed (GtkGestureClick *gesture,
 
           if (gtk_tree_view_draw_expanders (tree_view))
             {
-              gint expander_size = gtk_tree_view_get_expander_size (tree_view);
+              int expander_size = gtk_tree_view_get_expander_size (tree_view);
               if (!rtl)
                 cell_area.x += depth * expander_size;
               cell_area.width -= depth * expander_size;
@@ -3017,7 +3017,7 @@ gtk_tree_view_drag_gesture_begin (GtkGestureDrag *gesture,
                                   GtkTreeView    *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint bin_x, bin_y;
+  int bin_x, bin_y;
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
 
@@ -3052,7 +3052,7 @@ gtk_tree_view_drag_gesture_begin (GtkGestureDrag *gesture,
 
 static void
 gtk_tree_view_column_click_gesture_pressed (GtkGestureClick *gesture,
-                                            gint             n_press,
+                                            int              n_press,
                                             gdouble          x,
                                             gdouble          y,
                                             GtkTreeView     *tree_view)
@@ -3094,14 +3094,14 @@ gtk_tree_view_column_drag_gesture_begin (GtkGestureDrag *gesture,
   GtkTreeViewColumn *column;
   gboolean rtl;
   GList *list;
-  gint i;
+  int i;
 
   rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
 
   for (i = 0, list = priv->columns; list; list = list->next, i++)
     {
       gpointer drag_data;
-      gint column_width;
+      int column_width;
 
       column = list->data;
 
@@ -3257,7 +3257,7 @@ gtk_tree_view_drag_gesture_end (GtkGestureDrag *gesture,
 
 static void
 gtk_tree_view_click_gesture_released (GtkGestureClick *gesture,
-                                      gint             n_press,
+                                      int              n_press,
                                       gdouble          x,
                                       gdouble          y,
                                       GtkTreeView     *tree_view)
@@ -3320,11 +3320,11 @@ coords_are_over_arrow (GtkTreeView   *tree_view,
                        GtkTreeRBTree *tree,
                        GtkTreeRBNode *node,
                        /* these are in bin window coords */
-                       gint           x,
-                       gint           y)
+                       int            x,
+                       int            y)
 {
   GdkRectangle arrow;
-  gint x2;
+  int x2;
 
   if (!gtk_widget_get_realized (GTK_WIDGET (tree_view)))
     return FALSE;
@@ -3383,8 +3383,8 @@ do_prelight (GtkTreeView   *tree_view,
              GtkTreeRBTree *tree,
              GtkTreeRBNode *node,
             /* these are in bin_window coords */
-             gint           x,
-             gint           y)
+             int            x,
+             int            y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -3470,8 +3470,8 @@ prelight_or_select (GtkTreeView   *tree_view,
                     GtkTreeRBTree *tree,
                     GtkTreeRBNode *node,
                     /* these are in bin_window coords */
-                    gint           x,
-                    gint           y)
+                    int            x,
+                    int            y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkSelectionMode mode = gtk_tree_selection_get_mode (priv->selection);
@@ -3520,8 +3520,8 @@ ensure_unprelighted (GtkTreeView *tree_view)
 
 static void
 update_prelight (GtkTreeView *tree_view,
-                 gint         x,
-                 gint         y)
+                 int          x,
+                 int          y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   int new_y;
@@ -3554,7 +3554,7 @@ gtk_tree_view_motion_resize_column (GtkTreeView *tree_view,
                                     gdouble      y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint new_width;
+  int new_width;
   GtkTreeViewColumn *column;
 
   column = gtk_tree_view_get_column (tree_view, priv->drag_pos);
@@ -3601,8 +3601,8 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GdkRectangle visible_rect;
-  gint y;
-  gint offset;
+  int y;
+  int offset;
 
   if (gtk_gesture_is_recognized (priv->drag_gesture))
     {
@@ -3643,7 +3643,7 @@ gtk_tree_view_horizontal_autoscroll (GtkTreeView *tree_view)
   GdkEventSequence *sequence;
   GdkRectangle visible_rect;
   gdouble x;
-  gint offset;
+  int offset;
 
   sequence = gtk_gesture_single_get_current_sequence
     (GTK_GESTURE_SINGLE (priv->column_drag_gesture));
@@ -3675,7 +3675,7 @@ gtk_tree_view_motion_drag_column (GtkTreeView *tree_view,
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeViewColumn *column = priv->drag_column;
   GtkWidget *button;
-  gint width, button_width;
+  int width, button_width;
 
   button = gtk_tree_view_column_get_button (column);
   x += gtk_adjustment_get_value (priv->hadjustment);
@@ -3850,7 +3850,7 @@ gtk_tree_view_update_rubber_band_selection (GtkTreeView *tree_view)
   GtkTreeRBTree *start_tree, *end_tree;
   GtkTreeRBNode *start_node, *end_node;
   gdouble start_y, offset_y;
-  gint bin_y;
+  int bin_y;
 
   if (!gtk_gesture_is_active (priv->drag_gesture))
     return;
@@ -3987,7 +3987,7 @@ gtk_tree_view_update_rubber_band (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   gdouble start_x, start_y, offset_x, offset_y, x, y;
-  gint bin_x, bin_y;
+  int bin_x, bin_y;
 
   if (!gtk_gesture_is_recognized (priv->drag_gesture))
     return;
@@ -4019,7 +4019,7 @@ gtk_tree_view_snapshot_rubber_band (GtkTreeView *tree_view,
   gdouble start_x, start_y, offset_x, offset_y;
   GdkRectangle rect;
   GtkStyleContext *context;
-  gint bin_x, bin_y;
+  int bin_x, bin_y;
 
   if (!gtk_gesture_is_recognized (priv->drag_gesture))
     return;
@@ -4129,13 +4129,13 @@ gtk_tree_view_motion_controller_motion (GtkEventControllerMotion *controller,
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
-  gint new_y;
+  int new_y;
   GList *list;
   gboolean cursor_set = FALSE;
 
   if (priv->tree)
     {
-      gint bin_x, bin_y;
+      int bin_x, bin_y;
 
       /* If we are currently pressing down a button, we don't want to prelight anything else. */
       if (gtk_gesture_is_active (priv->drag_gesture) ||
@@ -4394,22 +4394,22 @@ gtk_tree_view_bin_snapshot (GtkWidget   *widget,
   GtkTreeRBNode *drag_highlight = NULL;
   GtkTreeRBTree *drag_highlight_tree = NULL;
   GtkTreeIter iter;
-  gint new_y;
-  gint y_offset, cell_offset;
-  gint max_height;
-  gint depth;
+  int new_y;
+  int y_offset, cell_offset;
+  int max_height;
+  int depth;
   GdkRectangle background_area;
   GdkRectangle cell_area;
   GdkRectangle clip;
   guint flags;
-  gint bin_window_width;
-  gint bin_window_height;
+  int bin_window_width;
+  int bin_window_height;
   GtkTreePath *drag_dest_path;
   GList *first_column, *last_column;
   gboolean has_can_focus_cell;
   gboolean rtl;
-  gint n_visible_columns;
-  gint expander_size;
+  int n_visible_columns;
+  int expander_size;
   gboolean draw_vgrid_lines, draw_hgrid_lines;
   GtkStyleContext *context;
   gboolean parity;
@@ -4500,7 +4500,7 @@ gtk_tree_view_bin_snapshot (GtkWidget   *widget,
   do
     {
       gboolean is_separator = FALSE;
-      gint n_col = 0;
+      int n_col = 0;
 
       parity = !parity;
       is_separator = row_is_separator (tree_view, &iter, NULL);
@@ -4544,7 +4544,7 @@ gtk_tree_view_bin_snapshot (GtkWidget   *widget,
        {
          GtkTreeViewColumn *column = list->data;
          GtkStateFlags state = 0;
-          gint width;
+          int width;
           gboolean draw_focus;
 
          if (!gtk_tree_view_column_get_visible (column))
@@ -4761,11 +4761,11 @@ gtk_tree_view_bin_snapshot (GtkWidget   *widget,
          if (gtk_tree_view_is_expander_column (tree_view, column) &&
              priv->tree_lines_enabled)
            {
-             gint x = background_area.x;
-             gint mult = rtl ? -1 : 1;
-             gint y0 = background_area.y;
-             gint y1 = background_area.y + background_area.height/2;
-             gint y2 = background_area.y + background_area.height;
+             int x = background_area.x;
+             int mult = rtl ? -1 : 1;
+             int y0 = background_area.y;
+             int y1 = background_area.y + background_area.height/2;
+             int y2 = background_area.y + background_area.height;
 
               if (rtl)
                 x += background_area.width - 1;
@@ -4894,7 +4894,7 @@ gtk_tree_view_bin_snapshot (GtkWidget   *widget,
           priv->draw_keyfocus &&
          gtk_widget_has_visible_focus (widget))
         {
-         gint tmp_y, tmp_height;
+         int tmp_y, tmp_height;
          GtkStateFlags focus_rect_state = 0;
 
           gtk_style_context_save (context);
@@ -4996,7 +4996,7 @@ gtk_tree_view_snapshot (GtkWidget   *widget,
   GtkWidget *button;
   GtkStyleContext *context;
   GList *list;
-  gint width, height;
+  int width, height;
 
   context = gtk_widget_get_style_context (widget);
   width = gtk_widget_get_width (widget);
@@ -5011,7 +5011,7 @@ gtk_tree_view_snapshot (GtkWidget   *widget,
 
   gtk_snapshot_save (snapshot);
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (
-                          - (gint) gtk_adjustment_get_value (priv->hadjustment),
+                          - (int) gtk_adjustment_get_value (priv->hadjustment),
                           gtk_tree_view_get_effective_header_height (tree_view)));
   gtk_tree_view_bin_snapshot (widget, snapshot);
   gtk_snapshot_restore (snapshot);
@@ -5076,7 +5076,7 @@ enum
 static GtkTreeViewColumn *
 gtk_tree_view_get_drop_column (GtkTreeView       *tree_view,
                               GtkTreeViewColumn *column,
-                              gint               drop_position)
+                              int                drop_position)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeViewColumn *left_column = NULL;
@@ -5341,7 +5341,7 @@ gtk_tree_view_key_controller_key_pressed (GtkEventControllerKey *key,
            || keyval == GDK_KEY_Right || keyval == GDK_KEY_KP_Right))
         {
           GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
-          gint column_width;
+          int column_width;
 
           if (!gtk_tree_view_column_get_resizable (column))
             {
@@ -5482,7 +5482,7 @@ gtk_tree_view_motion_controller_enter (GtkEventControllerMotion *controller,
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
-  gint new_y;
+  int new_y;
  
   if (priv->tree == NULL)
     return;
@@ -5532,13 +5532,13 @@ gtk_tree_view_focus_controller_focus_out (GtkEventController   *focus,
 /* Incremental Reflow
  */
 
-static gint
+static int
 get_separator_height (GtkTreeView *tree_view)
 {
   GtkStyleContext *context;
   GtkCssStyle *style;
   gdouble d;
-  gint min_size;
+  int min_size;
 
   context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
   gtk_style_context_save (context);
@@ -5570,12 +5570,12 @@ validate_row (GtkTreeView   *tree_view,
   GtkTreeViewColumn *column;
   GtkStyleContext *context;
   GList *list, *first_column, *last_column;
-  gint height = 0;
-  gint depth = gtk_tree_path_get_depth (path);
+  int height = 0;
+  int depth = gtk_tree_path_get_depth (path);
   gboolean retval = FALSE;
   gboolean is_separator = FALSE;
   gboolean draw_vgrid_lines, draw_hgrid_lines;
-  gint expander_size;
+  int expander_size;
   int separator_height;
 
   /* double check the row needs validating */
@@ -5613,10 +5613,10 @@ validate_row (GtkTreeView   *tree_view,
 
   for (list = priv->columns; list; list = list->next)
     {
-      gint padding = 0;
-      gint original_width;
-      gint new_width;
-      gint row_height;
+      int padding = 0;
+      int original_width;
+      int new_width;
+      int row_height;
 
       column = list->data;
 
@@ -5701,9 +5701,9 @@ validate_visible_area (GtkTreeView *tree_view)
   GtkTreeRBNode *node = NULL;
   gboolean need_redraw = FALSE;
   gboolean size_changed = FALSE;
-  gint total_height;
-  gint area_above = 0;
-  gint area_below = 0;
+  int total_height;
+  int area_above = 0;
+  int area_below = 0;
 
   if (priv->tree == NULL)
     return;
@@ -5737,7 +5737,7 @@ validate_visible_area (GtkTreeView *tree_view)
 
          if (priv->scroll_to_use_align)
            {
-             gint height = gtk_tree_view_get_row_height (tree_view, node);
+             int height = gtk_tree_view_get_row_height (tree_view, node);
              area_above = (total_height - height) *
                priv->scroll_to_row_align;
              area_below = total_height - area_above - height;
@@ -5750,8 +5750,8 @@ validate_visible_area (GtkTreeView *tree_view)
               * 1) row not visible
               * 2) row visible
               */
-             gint dy;
-             gint height = gtk_tree_view_get_row_height (tree_view, node);
+             int dy;
+             int height = gtk_tree_view_get_row_height (tree_view, node);
 
              dy = gtk_tree_rbtree_node_find_offset (tree, node);
 
@@ -5821,7 +5821,7 @@ validate_visible_area (GtkTreeView *tree_view)
    */
   if (path == NULL)
     {
-      gint offset;
+      int offset;
 
       offset = gtk_tree_rbtree_find_offset (priv->tree,
                                             TREE_WINDOW_Y_TO_RBTREE_Y (priv, 0),
@@ -6107,14 +6107,14 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
   GtkTreeRBTree *tree = NULL;
   GtkTreeRBNode *node = NULL;
   gboolean validated_area = FALSE;
-  gint retval = TRUE;
+  int retval = TRUE;
   GtkTreePath *path = NULL;
   GtkTreeIter iter;
   GTimer *timer;
-  gint i = 0;
+  int i = 0;
 
-  gint y = -1;
-  gint prev_height = -1;
+  int y = -1;
+  int prev_height = -1;
   gboolean fixed_height = TRUE;
 
   g_assert (tree_view);
@@ -6205,7 +6205,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
 
       if (changed)
         {
-          gint offset = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
+          int offset = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
 
           if (y == -1 || y > offset)
             y = offset;
@@ -6213,7 +6213,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
 
       if (!priv->fixed_height_check)
         {
-         gint height;
+         int height;
 
          height = gtk_tree_view_get_row_height (tree_view, node);
          if (prev_height < 0)
@@ -6238,7 +6238,7 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
   if (validated_area)
     {
       GtkRequisition requisition;
-      gint dummy;
+      int dummy;
 
       /* We temporarily guess a size, under the assumption that it will be the
        * same when we get our next size_allocate.  If we don't do this, we'll be
@@ -6447,7 +6447,7 @@ install_scroll_sync_handler (GtkTreeView *tree_view)
 static void
 gtk_tree_view_set_top_row (GtkTreeView *tree_view,
                           GtkTreePath *path,
-                          gint         offset)
+                          int          offset)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -6472,7 +6472,7 @@ static void
 gtk_tree_view_dy_to_top_row (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint offset;
+  int offset;
   GtkTreePath *path;
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
@@ -6791,7 +6791,7 @@ remove_open_timeout (GtkTreeView *tree_view)
 }
 
 
-static gint
+static int
 open_row_timeout (gpointer data)
 {
   GtkTreeView *tree_view = data;
@@ -6843,8 +6843,8 @@ static gboolean
 set_destination_row (GtkTreeView         *tree_view,
                      GtkDropTargetAsync  *dest,
                      /* coordinates relative to the widget */
-                     gint                 x,
-                     gint                 y,
+                     int                  x,
+                     int                  y,
                      GdkDragAction       *suggested_action,
                      GType               *target)
 {
@@ -6890,7 +6890,7 @@ set_destination_row (GtkTreeView         *tree_view,
                                           &path,
                                           &pos))
     {
-      gint n_children;
+      int n_children;
       GtkTreeModel *model;
 
       remove_open_timeout (tree_view);
@@ -7020,10 +7020,10 @@ gtk_tree_view_maybe_begin_dragging_row (GtkTreeView *tree_view)
   gdouble start_x, start_y, offset_x, offset_y;
   TreeViewDragInfo *di;
   GtkTreePath *path = NULL;
-  gint button;
+  int button;
   GtkTreeModel *model;
   gboolean retval = FALSE;
-  gint bin_x, bin_y;
+  int bin_x, bin_y;
   GdkSurface *surface;
   GdkDevice *device;
   GdkContentProvider *content;
@@ -7826,7 +7826,7 @@ search_first_focusable_path (GtkTreeView    *tree_view,
   return (*path != NULL);
 }
 
-static gint
+static int
 gtk_tree_view_focus (GtkWidget        *widget,
                     GtkDirectionType  direction)
 {
@@ -7919,7 +7919,7 @@ gtk_tree_view_css_changed (GtkWidget         *widget,
 static gboolean
 gtk_tree_view_real_move_cursor (GtkTreeView       *tree_view,
                                GtkMovementStep    step,
-                               gint               count,
+                               int                count,
                                 gboolean           extend,
                                 gboolean           modify)
 {
@@ -8101,12 +8101,12 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
 {
   GtkTreeView *tree_view = (GtkTreeView *) data;
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint *indices;
+  int *indices;
   GtkTreeRBTree *tree;
   GtkTreeRBNode *tmpnode = NULL;
-  gint depth;
-  gint i = 0;
-  gint height;
+  int depth;
+  int i = 0;
+  int height;
   gboolean free_path = FALSE;
 
   g_return_if_fail (path != NULL || iter != NULL);
@@ -8287,7 +8287,7 @@ check_selection_helper (GtkTreeRBTree *tree,
                         GtkTreeRBNode *node,
                         gpointer       data)
 {
-  gint *value = (gint *)data;
+  int *value = (int *)data;
 
   *value |= GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_IS_SELECTED);
 
@@ -8427,14 +8427,14 @@ static void
 gtk_tree_view_rows_reordered (GtkTreeModel *model,
                              GtkTreePath  *parent,
                              GtkTreeIter  *iter,
-                             gint         *new_order,
+                             int          *new_order,
                              gpointer      data)
 {
   GtkTreeView *tree_view = GTK_TREE_VIEW (data);
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
-  gint len;
+  int len;
 
   len = gtk_tree_model_iter_n_children (model, iter);
 
@@ -8485,12 +8485,12 @@ static void
 gtk_tree_view_get_background_xrange (GtkTreeView       *tree_view,
                                      GtkTreeRBTree     *tree,
                                      GtkTreeViewColumn *column,
-                                     gint              *x1,
-                                     gint              *x2)
+                                     int               *x1,
+                                     int               *x2)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeViewColumn *tmp_column = NULL;
-  gint total_width;
+  int total_width;
   GList *list;
   gboolean rtl;
 
@@ -8537,15 +8537,15 @@ gtk_tree_view_get_background_xrange (GtkTreeView       *tree_view,
 static void
 gtk_tree_view_get_arrow_xrange (GtkTreeView   *tree_view,
                                GtkTreeRBTree *tree,
-                                gint          *x1,
-                                gint          *x2)
+                                int           *x1,
+                                int           *x2)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint x_offset = 0;
+  int x_offset = 0;
   GList *list;
   GtkTreeViewColumn *tmp_column = NULL;
-  gint total_width;
-  gint expander_size, expander_render_size;
+  int total_width;
+  int expander_size, expander_render_size;
   gboolean rtl;
 
   rtl = (_gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
@@ -8593,7 +8593,7 @@ static void
 gtk_tree_view_build_tree (GtkTreeView   *tree_view,
                          GtkTreeRBTree *tree,
                          GtkTreeIter   *iter,
-                         gint           depth,
+                         int            depth,
                          gboolean       recurse)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
@@ -8662,7 +8662,7 @@ gtk_tree_view_clamp_node_visible (GtkTreeView   *tree_view,
                                  GtkTreeRBNode *node)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint node_dy, height;
+  int node_dy, height;
   GtkTreePath *path = NULL;
 
   if (!gtk_widget_get_realized (GTK_WIDGET (tree_view)))
@@ -8692,7 +8692,7 @@ gtk_tree_view_clamp_column_visible (GtkTreeView       *tree_view,
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkAllocation allocation;
-  gint x, width;
+  int x, width;
 
   if (column == NULL)
     return;
@@ -8756,7 +8756,7 @@ _gtk_tree_path_new_from_rbtree (GtkTreeRBTree *tree,
   GtkTreePath *path;
   GtkTreeRBTree *tmp_tree;
   GtkTreeRBNode *tmp_node, *last;
-  gint count;
+  int count;
 
   path = gtk_tree_path_new ();
 
@@ -8801,9 +8801,9 @@ _gtk_tree_view_find_node (GtkTreeView    *tree_view,
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBNode *tmpnode = NULL;
   GtkTreeRBTree *tmptree = priv->tree;
-  gint *indices = gtk_tree_path_get_indices (path);
-  gint depth = gtk_tree_path_get_depth (path);
-  gint i = 0;
+  int *indices = gtk_tree_path_get_indices (path);
+  int depth = gtk_tree_path_get_depth (path);
+  int i = 0;
 
   *node = NULL;
   *tree = NULL;
@@ -8881,7 +8881,7 @@ gtk_tree_view_add_move_binding (GtkWidgetClass *widget_class,
                                guint           modmask,
                                gboolean        add_shifted_binding,
                                GtkMovementStep step,
-                               gint            count)
+                               int             count)
 {
   gtk_widget_class_add_binding_signal (widget_class,
                                        keyval, modmask,
@@ -8909,13 +8909,13 @@ gtk_tree_view_add_move_binding (GtkWidgetClass *widget_class,
                                          "(iibb)", step, count, TRUE, TRUE);
 }
 
-static gint
+static int
 gtk_tree_view_unref_tree_helper (GtkTreeModel  *model,
                                 GtkTreeIter   *iter,
                                 GtkTreeRBTree *tree,
                                 GtkTreeRBNode *node)
 {
-  gint retval = FALSE;
+  int retval = FALSE;
   do
     {
       g_return_val_if_fail (node != NULL, FALSE);
@@ -8945,7 +8945,7 @@ gtk_tree_view_unref_tree_helper (GtkTreeModel  *model,
   return retval;
 }
 
-static gint
+static int
 gtk_tree_view_unref_and_check_selection_tree (GtkTreeView   *tree_view,
                                              GtkTreeRBTree *tree)
 {
@@ -8953,7 +8953,7 @@ gtk_tree_view_unref_and_check_selection_tree (GtkTreeView   *tree_view,
   GtkTreeIter iter;
   GtkTreePath *path;
   GtkTreeRBNode *node;
-  gint retval;
+  int retval;
 
   if (!tree)
     return FALSE;
@@ -8980,7 +8980,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView       *tree_view,
   GtkTreeViewColumnReorder *reorder;
   gboolean rtl;
   GList *tmp_list;
-  gint left;
+  int left;
 
   /* We want to precalculate the motion list such that we know what column slots
    * are available.
@@ -9115,7 +9115,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
                          GTK_EVENT_SEQUENCE_CLAIMED);
 }
 
-static inline gint
+static inline int
 gtk_tree_view_get_effective_header_height (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
@@ -9227,8 +9227,8 @@ gtk_tree_view_snapshot_arrow (GtkTreeView   *tree_view,
   GtkStateFlags state = 0;
   GtkStyleContext *context;
   GtkWidget *widget;
-  gint x_offset = 0;
-  gint x2;
+  int x_offset = 0;
+  int x2;
   GtkCellRendererState flags = 0;
 
   widget = GTK_WIDGET (tree_view);
@@ -9360,10 +9360,10 @@ gtk_tree_view_focus_to_cursor (GtkTreeView *tree_view)
 
 static void
 gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
-                                  gint         count)
+                                  int          count)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint selection_count;
+  int selection_count;
   GtkTreeRBTree *new_cursor_tree = NULL;
   GtkTreeRBNode *new_cursor_node = NULL;
   GtkTreePath *cursor_path = NULL;
@@ -9512,7 +9512,7 @@ gtk_tree_view_move_cursor_up_down (GtkTreeView *tree_view,
 
 static void
 gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
-                                       gint         count)
+                                       int          count)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreePath *old_cursor_path = NULL;
@@ -9521,8 +9521,8 @@ gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
   GtkTreeRBNode *start_cursor_node = NULL;
   GtkTreeRBTree *cursor_tree;
   GtkTreeRBNode *cursor_node;
-  gint y;
-  gint window_y;
+  int y;
+  int window_y;
 
   if (!gtk_widget_has_focus (GTK_WIDGET (tree_view)))
     return;
@@ -9537,7 +9537,7 @@ gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view,
   window_y = RBTREE_Y_TO_TREE_WINDOW_Y (priv, y);
   y += priv->cursor_offset;
   y += count * (int)gtk_adjustment_get_page_increment (priv->vadjustment);
-  y = CLAMP (y, (gint)gtk_adjustment_get_lower (priv->vadjustment),  (gint)gtk_adjustment_get_upper (priv->vadjustment));
+  y = CLAMP (y, (int)gtk_adjustment_get_lower (priv->vadjustment),  (int)gtk_adjustment_get_upper (priv->vadjustment));
 
   if (y >= gtk_tree_view_get_height (tree_view))
     y = gtk_tree_view_get_height (tree_view) - 1;
@@ -9609,7 +9609,7 @@ cleanup:
 
 static void
 gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
-                                     gint         count)
+                                     int          count)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreePath *cursor_path = NULL;
@@ -9706,7 +9706,7 @@ gtk_tree_view_move_cursor_left_right (GtkTreeView *tree_view,
 
 static void
 gtk_tree_view_move_cursor_start_end (GtkTreeView *tree_view,
-                                    gint         count)
+                                    int          count)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBTree *cursor_tree;
@@ -10165,7 +10165,7 @@ gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
   if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
     {
       GtkAllocation allocation;
-      gint dy;
+      int dy;
 
       gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
       dy = priv->dy - (int) gtk_adjustment_get_value (priv->vadjustment);
@@ -10326,7 +10326,7 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
 
   if (priv->model)
     {
-      gint i;
+      int i;
       GtkTreePath *path;
       GtkTreeIter iter;
       GtkTreeModelFlags flags;
@@ -10698,7 +10698,7 @@ gtk_tree_view_get_activate_on_single_click (GtkTreeView *tree_view)
  *
  * Returns: The number of columns in @tree_view after appending.
  **/
-gint
+int
 gtk_tree_view_append_column (GtkTreeView       *tree_view,
                             GtkTreeViewColumn *column)
 {
@@ -10718,7 +10718,7 @@ gtk_tree_view_append_column (GtkTreeView       *tree_view,
  *
  * Returns: The number of columns in @tree_view after removing.
  **/
-gint
+int
 gtk_tree_view_remove_column (GtkTreeView       *tree_view,
                              GtkTreeViewColumn *column)
 {
@@ -10791,10 +10791,10 @@ gtk_tree_view_remove_column (GtkTreeView       *tree_view,
  *
  * Returns: The number of columns in @tree_view after insertion.
  **/
-gint
+int
 gtk_tree_view_insert_column (GtkTreeView       *tree_view,
                              GtkTreeViewColumn *column,
-                             gint               position)
+                             int                position)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -10860,9 +10860,9 @@ gtk_tree_view_insert_column (GtkTreeView       *tree_view,
  *
  * Returns: The number of columns in @tree_view after insertion.
  **/
-gint
+int
 gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
-                                            gint             position,
+                                            int              position,
                                             const gchar     *title,
                                             GtkCellRenderer *cell,
                                             ...)
@@ -10871,7 +10871,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
   GtkTreeViewColumn *column;
   gchar *attribute;
   va_list args;
-  gint column_id;
+  int column_id;
 
   g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), -1);
 
@@ -10888,7 +10888,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
 
   while (attribute != NULL)
     {
-      column_id = va_arg (args, gint);
+      column_id = va_arg (args, int);
       gtk_tree_view_column_add_attribute (column, cell, attribute, column_id);
       attribute = va_arg (args, gchar *);
     }
@@ -10917,9 +10917,9 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView     *tree_view,
  *
  * Returns: number of columns in the tree view post-insert
  **/
-gint
+int
 gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
-                                             gint                       position,
+                                             int                        position,
                                              const gchar               *title,
                                              GtkCellRenderer           *cell,
                                              GtkTreeCellDataFunc        func,
@@ -10972,7 +10972,7 @@ gtk_tree_view_get_n_columns (GtkTreeView *tree_view)
  **/
 GtkTreeViewColumn *
 gtk_tree_view_get_column (GtkTreeView *tree_view,
-                         gint         n)
+                         int          n)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -11168,8 +11168,8 @@ gtk_tree_view_set_column_drag_function (GtkTreeView               *tree_view,
  **/
 void
 gtk_tree_view_scroll_to_point (GtkTreeView *tree_view,
-                               gint         tree_x,
-                               gint         tree_y)
+                               int          tree_x,
+                               int          tree_y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkAdjustment *hadj;
@@ -11263,7 +11263,7 @@ gtk_tree_view_scroll_to_cell (GtkTreeView       *tree_view,
     {
       GdkRectangle cell_rect;
       GdkRectangle vis_rect;
-      gint dest_x, dest_y;
+      int dest_x, dest_y;
 
       gtk_tree_view_get_background_area (tree_view, path, column, &cell_rect);
       gtk_tree_view_get_visible_rect (tree_view, &vis_rect);
@@ -11402,7 +11402,7 @@ gtk_tree_view_collapse_all (GtkTreeView *tree_view)
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
   GtkTreePath *path;
-  gint *indices;
+  int *indices;
 
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
@@ -11439,8 +11439,8 @@ void
 gtk_tree_view_expand_to_path (GtkTreeView *tree_view,
                              GtkTreePath *path)
 {
-  gint i, depth;
-  gint *indices;
+  int i, depth;
+  int *indices;
   GtkTreePath *tmp;
 
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
@@ -12157,17 +12157,17 @@ gtk_tree_view_set_cursor_on_cell (GtkTreeView       *tree_view,
  **/
 gboolean
 gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
-                              gint                x,
-                              gint                y,
+                              int                 x,
+                              int                 y,
                               GtkTreePath       **path,
                               GtkTreeViewColumn **column,
-                               gint               *cell_x,
-                               gint               *cell_y)
+                               int                *cell_x,
+                               int                *cell_y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
-  gint y_offset;
+  int y_offset;
 
   g_return_val_if_fail (tree_view != NULL, FALSE);
 
@@ -12190,10 +12190,10 @@ gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
       GtkTreeViewColumn *tmp_column;
       GtkTreeViewColumn *last_column = NULL;
       GList *list;
-      gint remaining_x = x;
+      int remaining_x = x;
       gboolean found = FALSE;
       gboolean rtl;
-      gint width;
+      int width;
 
       rtl = (_gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
       for (list = (rtl ? g_list_last (priv->columns) : g_list_first (priv->columns));
@@ -12259,7 +12259,7 @@ gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
 }
 
 
-static inline gint
+static inline int
 gtk_tree_view_get_cell_area_height (GtkTreeView   *tree_view,
                                     GtkTreeRBNode *node)
 {
@@ -12281,7 +12281,7 @@ gtk_tree_view_get_cell_area_height (GtkTreeView   *tree_view,
   return height;
 }
 
-static inline gint
+static inline int
 gtk_tree_view_get_cell_area_y_offset (GtkTreeView   *tree_view,
                                       GtkTreeRBTree *tree,
                                       GtkTreeRBNode *node)
@@ -12362,7 +12362,7 @@ gtk_tree_view_get_cell_area (GtkTreeView        *tree_view,
       if (column &&
          gtk_tree_view_is_expander_column (tree_view, column))
        {
-         gint depth = gtk_tree_path_get_depth (path);
+         int depth = gtk_tree_path_get_depth (path);
          gboolean rtl;
 
          rtl = _gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL;
@@ -12384,7 +12384,7 @@ gtk_tree_view_get_cell_area (GtkTreeView        *tree_view,
     }
 }
 
-static inline gint
+static inline int
 gtk_tree_view_get_row_height (GtkTreeView   *tree_view,
                               GtkTreeRBNode *node)
 {
@@ -12406,7 +12406,7 @@ gtk_tree_view_get_row_height (GtkTreeView   *tree_view,
   return height;
 }
 
-static inline gint
+static inline int
 gtk_tree_view_get_row_y_offset (GtkTreeView   *tree_view,
                                 GtkTreeRBTree *tree,
                                 GtkTreeRBNode *node)
@@ -12469,7 +12469,7 @@ gtk_tree_view_get_background_area (GtkTreeView        *tree_view,
 
   if (column)
     {
-      gint x2 = 0;
+      int x2 = 0;
 
       gtk_tree_view_get_background_xrange (tree_view, tree, column, &rect->x, &x2);
       rect->width = x2 - rect->x;
@@ -12522,12 +12522,12 @@ gtk_tree_view_get_visible_rect (GtkTreeView  *tree_view,
  **/
 void
 gtk_tree_view_convert_widget_to_tree_coords (GtkTreeView *tree_view,
-                                             gint         wx,
-                                             gint         wy,
-                                             gint        *tx,
-                                             gint        *ty)
+                                             int          wx,
+                                             int          wy,
+                                             int         *tx,
+                                             int         *ty)
 {
-  gint x, y;
+  int x, y;
 
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
@@ -12552,12 +12552,12 @@ gtk_tree_view_convert_widget_to_tree_coords (GtkTreeView *tree_view,
  **/
 void
 gtk_tree_view_convert_tree_to_widget_coords (GtkTreeView *tree_view,
-                                             gint         tx,
-                                             gint         ty,
-                                             gint        *wx,
-                                             gint        *wy)
+                                             int          tx,
+                                             int          ty,
+                                             int         *wx,
+                                             int         *wy)
 {
-  gint x, y;
+  int x, y;
 
   g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
 
@@ -12581,10 +12581,10 @@ gtk_tree_view_convert_tree_to_widget_coords (GtkTreeView *tree_view,
  **/
 void
 gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
-                                                   gint         wx,
-                                                   gint         wy,
-                                                   gint        *bx,
-                                                   gint        *by)
+                                                   int          wx,
+                                                   int          wy,
+                                                   int         *bx,
+                                                   int         *by)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -12608,10 +12608,10 @@ gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
  **/
 void
 gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
-                                                   gint         bx,
-                                                   gint         by,
-                                                   gint        *wx,
-                                                   gint        *wy)
+                                                   int          bx,
+                                                   int          by,
+                                                   int         *wx,
+                                                   int         *wy)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -12636,10 +12636,10 @@ gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
  **/
 void
 gtk_tree_view_convert_tree_to_bin_window_coords (GtkTreeView *tree_view,
-                                                 gint         tx,
-                                                 gint         ty,
-                                                 gint        *bx,
-                                                 gint        *by)
+                                                 int          tx,
+                                                 int          ty,
+                                                 int         *bx,
+                                                 int         *by)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -12664,10 +12664,10 @@ gtk_tree_view_convert_tree_to_bin_window_coords (GtkTreeView *tree_view,
  **/
 void
 gtk_tree_view_convert_bin_window_to_tree_coords (GtkTreeView *tree_view,
-                                                 gint         bx,
-                                                 gint         by,
-                                                 gint        *tx,
-                                                 gint        *ty)
+                                                 int          bx,
+                                                 int          by,
+                                                 int         *tx,
+                                                 int         *ty)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -12725,7 +12725,7 @@ gtk_tree_view_get_visible_range (GtkTreeView  *tree_view,
 
   if (end_path)
     {
-      gint y;
+      int y;
 
       if (gtk_tree_view_get_height (tree_view) < gtk_adjustment_get_page_size (priv->vadjustment))
         y = gtk_tree_view_get_height (tree_view) - 1;
@@ -12779,12 +12779,12 @@ gtk_tree_view_get_visible_range (GtkTreeView  *tree_view,
  */
 gboolean
 gtk_tree_view_is_blank_at_pos (GtkTreeView       *tree_view,
-                               gint                x,
-                               gint                y,
+                               int                 x,
+                               int                 y,
                                GtkTreePath       **path,
                                GtkTreeViewColumn **column,
-                               gint               *cell_x,
-                               gint               *cell_y)
+                               int                *cell_x,
+                               int                *cell_y)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   GtkTreeRBTree *tree;
@@ -13040,7 +13040,7 @@ gtk_tree_view_set_drag_dest_row (GtkTreeView            *tree_view,
       && gtk_tree_path_get_depth (path) == 1
       && gtk_tree_path_get_indices (path)[0] == 0)
     {
-      gint n_children;
+      int n_children;
 
       n_children = gtk_tree_model_iter_n_children (priv->model,
                                                    NULL);
@@ -13122,14 +13122,14 @@ gtk_tree_view_get_drag_dest_row (GtkTreeView              *tree_view,
  **/
 gboolean
 gtk_tree_view_get_dest_row_at_pos (GtkTreeView             *tree_view,
-                                   gint                     drag_x,
-                                   gint                     drag_y,
+                                   int                      drag_x,
+                                   int                      drag_y,
                                    GtkTreePath            **path,
                                    GtkTreeViewDropPosition *pos)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint cell_y;
-  gint bin_x, bin_y;
+  int cell_y;
+  int bin_x, bin_y;
   gdouble offset_into_row;
   gdouble fourth;
   GdkRectangle cell;
@@ -13244,16 +13244,16 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView  *tree_view,
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
   GtkStyleContext *context;
-  gint cell_offset;
+  int cell_offset;
   GList *list;
   GdkRectangle background_area;
   GtkWidget *widget;
   GtkSnapshot *snapshot;
   GdkPaintable *paintable;
-  gint depth;
+  int depth;
   /* start drawing inside the black outline */
-  gint x = 1, y = 1;
-  gint bin_window_width;
+  int x = 1, y = 1;
+  int bin_window_width;
   gboolean is_separator = FALSE;
   gboolean rtl;
 
@@ -13436,7 +13436,7 @@ gtk_tree_view_get_enable_search (GtkTreeView *tree_view)
  *
  * Returns: the column the interactive search code searches in.
  */
-gint
+int
 gtk_tree_view_get_search_column (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
@@ -13463,7 +13463,7 @@ gtk_tree_view_get_search_column (GtkTreeView *tree_view)
  */
 void
 gtk_tree_view_set_search_column (GtkTreeView *tree_view,
-                                gint         column)
+                                int          column)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -13838,8 +13838,8 @@ gtk_tree_view_search_move (GtkWidget   *popover,
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
   gboolean ret;
-  gint len;
-  gint count = 0;
+  int len;
+  int count = 0;
   const gchar *text;
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -13888,7 +13888,7 @@ gtk_tree_view_search_move (GtkWidget   *popover,
 
 static gboolean
 gtk_tree_view_search_equal_func (GtkTreeModel *model,
-                                gint          column,
+                                int           column,
                                 const gchar  *key,
                                 GtkTreeIter  *iter,
                                 gpointer      search_data)
@@ -13947,8 +13947,8 @@ gtk_tree_view_search_iter (GtkTreeModel     *model,
                           GtkTreeSelection *selection,
                           GtkTreeIter      *iter,
                           const gchar      *text,
-                          gint             *count,
-                          gint              n)
+                          int              *count,
+                          int               n)
 {
   GtkTreeRBTree *tree = NULL;
   GtkTreeRBNode *node = NULL;
@@ -14053,8 +14053,8 @@ gtk_tree_view_search_init (GtkWidget   *entry,
                           GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
-  gint ret;
-  gint count = 0;
+  int ret;
+  int count = 0;
   const gchar *text;
   GtkTreeIter iter;
   GtkTreeModel *model;
@@ -14127,7 +14127,7 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view,
   GdkRectangle cell_area;
   GtkTreeViewColumn *focus_column;
   guint flags = 0; /* can be 0, as the flags are primarily for rendering */
-  gint retval = FALSE;
+  int retval = FALSE;
   GtkTreeRBTree *cursor_tree;
   GtkTreeRBNode *cursor_node;
 
@@ -14586,7 +14586,7 @@ gtk_tree_view_get_show_expanders (GtkTreeView *tree_view)
  */
 void
 gtk_tree_view_set_level_indentation (GtkTreeView *tree_view,
-                                    gint         indentation)
+                                    int          indentation)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -14605,7 +14605,7 @@ gtk_tree_view_set_level_indentation (GtkTreeView *tree_view,
  * Returns: the amount of extra indentation for child levels in
  * @tree_view.  A return value of 0 means that this feature is disabled.
  */
-gint
+int
 gtk_tree_view_get_level_indentation (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
@@ -14675,7 +14675,7 @@ gtk_tree_view_set_tooltip_cell (GtkTreeView       *tree_view,
   if (column && cell)
     {
       GdkRectangle tmp;
-      gint start, width;
+      int start, width;
 
       /* We always pass in path here, whether it is NULL or not.
        * For cells in expander columns path must be specified so that
@@ -14755,8 +14755,8 @@ gtk_tree_view_set_tooltip_cell (GtkTreeView       *tree_view,
  */
 gboolean
 gtk_tree_view_get_tooltip_context (GtkTreeView   *tree_view,
-                                  gint          *x,
-                                  gint          *y,
+                                  int           *x,
+                                  int           *y,
                                   gboolean       keyboard_tip,
                                   GtkTreeModel **model,
                                   GtkTreePath  **path,
@@ -14802,8 +14802,8 @@ gtk_tree_view_get_tooltip_context (GtkTreeView   *tree_view,
 
 static gboolean
 gtk_tree_view_set_tooltip_query_cb (GtkWidget  *widget,
-                                   gint        x,
-                                   gint        y,
+                                   int         x,
+                                   int         y,
                                    gboolean    keyboard_tip,
                                    GtkTooltip *tooltip,
                                    gpointer    data)
@@ -14872,7 +14872,7 @@ gtk_tree_view_set_tooltip_query_cb (GtkWidget  *widget,
  */
 void
 gtk_tree_view_set_tooltip_column (GtkTreeView *tree_view,
-                                 gint         column)
+                                 int          column)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
 
@@ -14912,7 +14912,7 @@ gtk_tree_view_set_tooltip_column (GtkTreeView *tree_view,
  * Returns: the index of the tooltip column that is currently being
  * used, or -1 if this is disabled.
  */
-gint
+int
 gtk_tree_view_get_tooltip_column (GtkTreeView *tree_view)
 {
   GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view);
index 1678b02495db99e0885fd294f49c4c7a7cca65b7..cd378de86aefaec3a6551b3d4e4928d788963b79 100644 (file)
@@ -115,7 +115,7 @@ typedef void     (* GtkTreeViewMappingFunc)    (GtkTreeView             *tree_vi
  * Returns: %FALSE if the row matches, %TRUE otherwise.
  */
 typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel            *model,
-                                               gint                     column,
+                                               int                      column,
                                                const gchar             *key,
                                                GtkTreeIter             *iter,
                                                gpointer                 search_data);
@@ -167,7 +167,7 @@ struct _GtkTreeViewClass
   /* Key Binding signals */
   gboolean (* move_cursor)                (GtkTreeView       *tree_view,
                                            GtkMovementStep    step,
-                                           gint               count,
+                                           int                count,
                                            gboolean           extend,
                                            gboolean           modify);
   gboolean (* select_all)                 (GtkTreeView       *tree_view);
@@ -224,24 +224,24 @@ void                   gtk_tree_view_set_activate_on_single_click  (GtkTreeView
 
 /* Column functions */
 GDK_AVAILABLE_IN_ALL
-gint                   gtk_tree_view_append_column                 (GtkTreeView               *tree_view,
+int                    gtk_tree_view_append_column                 (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column);
 GDK_AVAILABLE_IN_ALL
-gint                   gtk_tree_view_remove_column                 (GtkTreeView               *tree_view,
+int                    gtk_tree_view_remove_column                 (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column);
 GDK_AVAILABLE_IN_ALL
-gint                   gtk_tree_view_insert_column                 (GtkTreeView               *tree_view,
+int                    gtk_tree_view_insert_column                 (GtkTreeView               *tree_view,
                                                                    GtkTreeViewColumn         *column,
-                                                                   gint                       position);
+                                                                   int                        position);
 GDK_AVAILABLE_IN_ALL
-gint                   gtk_tree_view_insert_column_with_attributes (GtkTreeView               *tree_view,
-                                                                   gint                       position,
+int                    gtk_tree_view_insert_column_with_attributes (GtkTreeView               *tree_view,
+                                                                   int                        position,
                                                                    const gchar               *title,
                                                                    GtkCellRenderer           *cell,
                                                                    ...) G_GNUC_NULL_TERMINATED;
 GDK_AVAILABLE_IN_ALL
-gint                   gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
-                                                                   gint                       position,
+int                    gtk_tree_view_insert_column_with_data_func  (GtkTreeView               *tree_view,
+                                                                   int                        position,
                                                                    const gchar               *title,
                                                                    GtkCellRenderer           *cell,
                                                                     GtkTreeCellDataFunc        func,
@@ -252,7 +252,7 @@ GDK_AVAILABLE_IN_ALL
 guint                  gtk_tree_view_get_n_columns                 (GtkTreeView               *tree_view);
 GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumn     *gtk_tree_view_get_column                    (GtkTreeView               *tree_view,
-                                                                   gint                       n);
+                                                                   int                        n);
 GDK_AVAILABLE_IN_ALL
 GList                 *gtk_tree_view_get_columns                   (GtkTreeView               *tree_view);
 GDK_AVAILABLE_IN_ALL
@@ -273,8 +273,8 @@ void                   gtk_tree_view_set_column_drag_function      (GtkTreeView
 /* Actions */
 GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_scroll_to_point               (GtkTreeView               *tree_view,
-                                                                   gint                       tree_x,
-                                                                   gint                       tree_y);
+                                                                   int                        tree_x,
+                                                                   int                        tree_y);
 GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_scroll_to_cell                (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
@@ -332,12 +332,12 @@ void                   gtk_tree_view_get_cursor                    (GtkTreeView
 /* Layout information */
 GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_path_at_pos               (GtkTreeView               *tree_view,
-                                                                   gint                       x,
-                                                                   gint                       y,
+                                                                   int                        x,
+                                                                   int                        y,
                                                                    GtkTreePath              **path,
                                                                    GtkTreeViewColumn        **column,
-                                                                   gint                      *cell_x,
-                                                                   gint                      *cell_y);
+                                                                   int                       *cell_x,
+                                                                   int                       *cell_y);
 GDK_AVAILABLE_IN_ALL
 void                   gtk_tree_view_get_cell_area                 (GtkTreeView               *tree_view,
                                                                    GtkTreePath               *path,
@@ -357,12 +357,12 @@ gboolean               gtk_tree_view_get_visible_range             (GtkTreeView
                                                                    GtkTreePath              **end_path);
 GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_is_blank_at_pos               (GtkTreeView               *tree_view,
-                                                                    gint                       x,
-                                                                    gint                       y,
+                                                                    int                        x,
+                                                                    int                        y,
                                                                     GtkTreePath              **path,
                                                                     GtkTreeViewColumn        **column,
-                                                                    gint                      *cell_x,
-                                                                    gint                      *cell_y);
+                                                                    int                       *cell_x,
+                                                                    int                       *cell_y);
 
 /* Drag-and-Drop support */
 GDK_AVAILABLE_IN_ALL
@@ -391,8 +391,8 @@ void                   gtk_tree_view_get_drag_dest_row             (GtkTreeView
                                                                    GtkTreeViewDropPosition   *pos);
 GDK_AVAILABLE_IN_ALL
 gboolean               gtk_tree_view_get_dest_row_at_pos           (GtkTreeView               *tree_view,
-                                                                   gint                       drag_x,
-                                                                   gint                       drag_y,
+                                                                   int                        drag_x,
+                                                                   int                        drag_y,
                                                                    GtkTreePath              **path,
                                                                    GtkTreeViewDropPosition   *pos);
 GDK_AVAILABLE_IN_ALL
@@ -406,10 +406,10 @@ void                       gtk_tree_view_set_enable_search     (GtkTreeView
 GDK_AVAILABLE_IN_ALL
 gboolean                   gtk_tree_view_get_enable_search     (GtkTreeView                *tree_view);
 GDK_AVAILABLE_IN_ALL
-gint                       gtk_tree_view_get_search_column     (GtkTreeView                *tree_view);
+int                        gtk_tree_view_get_search_column     (GtkTreeView                *tree_view);
 GDK_AVAILABLE_IN_ALL
 void                       gtk_tree_view_set_search_column     (GtkTreeView                *tree_view,
-                                                               gint                        column);
+                                                               int                         column);
 GDK_AVAILABLE_IN_ALL
 GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView                *tree_view);
 GDK_AVAILABLE_IN_ALL
@@ -427,40 +427,40 @@ void                          gtk_tree_view_set_search_entry         (GtkTreeVie
 /* Convert between the different coordinate systems */
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_widget_to_tree_coords       (GtkTreeView *tree_view,
-                                                       gint         wx,
-                                                       gint         wy,
-                                                       gint        *tx,
-                                                       gint        *ty);
+                                                       int          wx,
+                                                       int          wy,
+                                                       int         *tx,
+                                                       int         *ty);
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_tree_to_widget_coords       (GtkTreeView *tree_view,
-                                                       gint         tx,
-                                                       gint         ty,
-                                                       gint        *wx,
-                                                       gint        *wy);
+                                                       int          tx,
+                                                       int          ty,
+                                                       int         *wx,
+                                                       int         *wy);
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
-                                                       gint         wx,
-                                                       gint         wy,
-                                                       gint        *bx,
-                                                       gint        *by);
+                                                       int          wx,
+                                                       int          wy,
+                                                       int         *bx,
+                                                       int         *by);
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
-                                                       gint         bx,
-                                                       gint         by,
-                                                       gint        *wx,
-                                                       gint        *wy);
+                                                       int          bx,
+                                                       int          by,
+                                                       int         *wx,
+                                                       int         *wy);
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_tree_to_bin_window_coords   (GtkTreeView *tree_view,
-                                                       gint         tx,
-                                                       gint         ty,
-                                                       gint        *bx,
-                                                       gint        *by);
+                                                       int          tx,
+                                                       int          ty,
+                                                       int         *bx,
+                                                       int         *by);
 GDK_AVAILABLE_IN_ALL
 void gtk_tree_view_convert_bin_window_to_tree_coords   (GtkTreeView *tree_view,
-                                                       gint         bx,
-                                                       gint         by,
-                                                       gint        *tx,
-                                                       gint        *ty);
+                                                       int          bx,
+                                                       int          by,
+                                                       int         *tx,
+                                                       int         *ty);
 
 GDK_AVAILABLE_IN_ALL
 void     gtk_tree_view_set_fixed_height_mode (GtkTreeView          *tree_view,
@@ -511,9 +511,9 @@ GDK_AVAILABLE_IN_ALL
 gboolean                    gtk_tree_view_get_show_expanders     (GtkTreeView                *tree_view);
 GDK_AVAILABLE_IN_ALL
 void                        gtk_tree_view_set_level_indentation  (GtkTreeView                *tree_view,
-                                                                 gint                        indentation);
+                                                                 int                         indentation);
 GDK_AVAILABLE_IN_ALL
-gint                        gtk_tree_view_get_level_indentation  (GtkTreeView                *tree_view);
+int                         gtk_tree_view_get_level_indentation  (GtkTreeView                *tree_view);
 
 /* Convenience functions for setting tooltips */
 GDK_AVAILABLE_IN_ALL
@@ -528,17 +528,17 @@ void          gtk_tree_view_set_tooltip_cell   (GtkTreeView       *tree_view,
                                                GtkCellRenderer   *cell);
 GDK_AVAILABLE_IN_ALL
 gboolean      gtk_tree_view_get_tooltip_context(GtkTreeView       *tree_view,
-                                               gint              *x,
-                                               gint              *y,
+                                               int               *x,
+                                               int               *y,
                                                gboolean           keyboard_tip,
                                                GtkTreeModel     **model,
                                                GtkTreePath      **path,
                                                GtkTreeIter       *iter);
 GDK_AVAILABLE_IN_ALL
 void          gtk_tree_view_set_tooltip_column (GtkTreeView       *tree_view,
-                                               gint               column);
+                                               int                column);
 GDK_AVAILABLE_IN_ALL
-gint          gtk_tree_view_get_tooltip_column (GtkTreeView       *tree_view);
+int           gtk_tree_view_get_tooltip_column (GtkTreeView       *tree_view);
 
 G_END_DECLS
 
index 2cd41084b17c121f147dececc0cd64a0e0b39ea8..f9dc51f799b9114007cf01a3b8e63b6cfb171977 100644 (file)
@@ -166,23 +166,23 @@ struct _GtkTreeViewColumnPrivate
   /* Sizing fields */
   /* see gtk+/doc/tree-column-sizing.txt for more information on them */
   GtkTreeViewColumnSizing column_type;
-  gint padding;
-  gint x_offset;
-  gint width;
-  gint fixed_width;
-  gint min_width;
-  gint max_width;
+  int padding;
+  int x_offset;
+  int width;
+  int fixed_width;
+  int min_width;
+  int max_width;
 
   /* dragging columns */
-  gint drag_x;
-  gint drag_y;
+  int drag_x;
+  int drag_y;
 
   gchar *title;
 
   /* Sorting */
   gulong      sort_clicked_signal;
   gulong      sort_column_changed_signal;
-  gint        sort_column_id;
+  int         sort_column_id;
   GtkSortType sort_order;
 
   /* Cell area */
@@ -904,7 +904,7 @@ static void
 gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
 {
   GtkTreeViewColumnPrivate *priv = tree_column->priv;
-  gint sort_column_id = -1;
+  int sort_column_id = -1;
   GtkWidget *hbox;
   GtkWidget *frame;
   GtkWidget *arrow;
@@ -1112,7 +1112,7 @@ gtk_tree_view_model_sort_column_changed (GtkTreeSortable   *sortable,
                                         GtkTreeViewColumn *column)
 {
   GtkTreeViewColumnPrivate *priv = column->priv;
-  gint sort_column_id;
+  int sort_column_id;
   GtkSortType order;
 
   if (gtk_tree_sortable_get_sort_column_id (sortable,
@@ -1142,7 +1142,7 @@ gtk_tree_view_column_sort (GtkTreeViewColumn *tree_column,
   GtkTreeViewColumnPrivate *priv = tree_column->priv;
   GtkTreeModel *model;
   GtkTreeSortable *sortable;
-  gint sort_column_id;
+  int sort_column_id;
   GtkSortType order;
   gboolean has_sort_column;
   gboolean has_default_sort_func;
@@ -1200,7 +1200,7 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
   if (GTK_IS_TREE_SORTABLE (model) &&
       priv->sort_column_id != -1)
     {
-      gint real_sort_column_id;
+      int real_sort_column_id;
       GtkSortType real_order;
 
       if (priv->sort_column_changed_signal == 0)
@@ -1403,8 +1403,8 @@ GtkCellRenderer *
 _gtk_tree_view_column_get_cell_at_pos (GtkTreeViewColumn *column,
                                        GdkRectangle      *cell_area,
                                        GdkRectangle      *background_area,
-                                       gint               x,
-                                       gint               y)
+                                       int                x,
+                                       int                y)
 {
   GtkCellRenderer *match = NULL;
   GtkTreeViewColumnPrivate *priv = column->priv;
@@ -1448,8 +1448,8 @@ gboolean
 _gtk_tree_view_column_is_blank_at_pos (GtkTreeViewColumn *column,
                                        GdkRectangle      *cell_area,
                                        GdkRectangle      *background_area,
-                                       gint               x,
-                                       gint               y)
+                                       int                x,
+                                       int                y)
 {
   GtkCellRenderer *match;
   GdkRectangle cell_alloc, aligned_area, inner_area;
@@ -1637,7 +1637,7 @@ void
 gtk_tree_view_column_add_attribute (GtkTreeViewColumn *tree_column,
                                    GtkCellRenderer   *cell_renderer,
                                    const gchar       *attribute,
-                                   gint               column)
+                                   int                column)
 {
   gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (tree_column),
                                  cell_renderer, attribute, column);
@@ -1650,7 +1650,7 @@ gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column,
 {
   GtkTreeViewColumnPrivate *priv = tree_column->priv;
   gchar *attribute;
-  gint column;
+  int column;
 
   attribute = va_arg (args, gchar *);
 
@@ -1659,7 +1659,7 @@ gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column,
   
   while (attribute != NULL)
     {
-      column = va_arg (args, gint);
+      column = va_arg (args, int);
       gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->cell_area),
                                      cell_renderer, attribute, column);
       attribute = va_arg (args, gchar *);
@@ -1747,7 +1747,7 @@ gtk_tree_view_column_clear_attributes (GtkTreeViewColumn *tree_column,
  **/
 void
 gtk_tree_view_column_set_spacing (GtkTreeViewColumn *tree_column,
-                                 gint               spacing)
+                                 int                spacing)
 {
   GtkTreeViewColumnPrivate *priv;
 
@@ -1773,7 +1773,7 @@ gtk_tree_view_column_set_spacing (GtkTreeViewColumn *tree_column,
  * 
  * Returns: the spacing of @tree_column.
  **/
-gint
+int
 gtk_tree_view_column_get_spacing (GtkTreeViewColumn *tree_column)
 {
   GtkTreeViewColumnPrivate *priv;
@@ -1947,7 +1947,7 @@ gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column)
  * 
  * Returns: The current width of @tree_column.
  **/
-gint
+int
 gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
@@ -1963,7 +1963,7 @@ gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column)
  * 
  * Returns: The current X offset of @tree_column.
  */
-gint
+int
 gtk_tree_view_column_get_x_offset (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
@@ -1971,11 +1971,11 @@ gtk_tree_view_column_get_x_offset (GtkTreeViewColumn *tree_column)
   return tree_column->priv->x_offset;
 }
 
-gint
+int
 _gtk_tree_view_column_request_width (GtkTreeViewColumn *tree_column)
 {
   GtkTreeViewColumnPrivate *priv;
-  gint real_requested_width;
+  int real_requested_width;
 
   priv = tree_column->priv;
 
@@ -1985,8 +1985,8 @@ _gtk_tree_view_column_request_width (GtkTreeViewColumn *tree_column)
     }
   else if (gtk_tree_view_get_headers_visible (GTK_TREE_VIEW (priv->tree_view)))
     {
-      gint button_request;
-      gint requested_width;
+      int button_request;
+      int requested_width;
 
       gtk_cell_area_context_get_preferred_width (priv->cell_area_context, &requested_width, NULL);
       requested_width += priv->padding;
@@ -1997,7 +1997,7 @@ _gtk_tree_view_column_request_width (GtkTreeViewColumn *tree_column)
     }
   else
     {
-      gint requested_width;
+      int requested_width;
 
       gtk_cell_area_context_get_preferred_width (priv->cell_area_context, &requested_width, NULL);
       requested_width += priv->padding;
@@ -2073,7 +2073,7 @@ _gtk_tree_view_column_allocate (GtkTreeViewColumn *tree_column,
  **/
 void
 gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
-                                     gint               fixed_width)
+                                     int                fixed_width)
 {
   GtkTreeViewColumnPrivate *priv;
 
@@ -2103,7 +2103,7 @@ gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
  *
  * Returns: The fixed width of the column.
  **/
-gint
+int
 gtk_tree_view_column_get_fixed_width (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
@@ -2121,7 +2121,7 @@ gtk_tree_view_column_get_fixed_width (GtkTreeViewColumn *tree_column)
  **/
 void
 gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
-                                   gint               min_width)
+                                   int                min_width)
 {
   GtkTreeViewColumnPrivate *priv;
 
@@ -2165,7 +2165,7 @@ gtk_tree_view_column_set_min_width (GtkTreeViewColumn *tree_column,
  * 
  * Returns: The minimum width of the @tree_column.
  **/
-gint
+int
 gtk_tree_view_column_get_min_width (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), -1);
@@ -2185,7 +2185,7 @@ gtk_tree_view_column_get_min_width (GtkTreeViewColumn *tree_column)
  **/
 void
 gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
-                                   gint               max_width)
+                                   int                max_width)
 {
   GtkTreeViewColumnPrivate *priv;
 
@@ -2229,7 +2229,7 @@ gtk_tree_view_column_set_max_width (GtkTreeViewColumn *tree_column,
  * 
  * Returns: The maximum width of the @tree_column.
  **/
-gint
+int
 gtk_tree_view_column_get_max_width (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), -1);
@@ -2548,7 +2548,7 @@ gtk_tree_view_column_get_reorderable (GtkTreeViewColumn *tree_column)
  **/
 void
 gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,
-                                        gint               sort_column_id)
+                                        int                sort_column_id)
 {
   GtkTreeViewColumnPrivate *priv;
 
@@ -2609,7 +2609,7 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,
  * Returns: the current @sort_column_id for this column, or -1 if
  *               this column can’t be used for sorting.
  **/
-gint
+int
 gtk_tree_view_column_get_sort_column_id (GtkTreeViewColumn *tree_column)
 {
   g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), 0);
@@ -2755,7 +2755,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn  *tree_column,
                                     int                *height)
 {
   GtkTreeViewColumnPrivate *priv;
-  gint min_width = 0, min_height = 0;
+  int min_width = 0, min_height = 0;
 
   g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
 
@@ -2948,8 +2948,8 @@ _gtk_tree_view_column_cell_get_dirty (GtkTreeViewColumn  *tree_column)
 gboolean
 gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column,
                                        GtkCellRenderer   *cell_renderer,
-                                       gint              *x_offset,
-                                       gint              *width)
+                                       int               *x_offset,
+                                       int               *width)
 {
   GtkTreeViewColumnPrivate *priv;
   GdkRectangle cell_area;
@@ -3035,22 +3035,22 @@ gtk_tree_view_column_get_button (GtkTreeViewColumn *tree_column)
 
 void
 _gtk_tree_view_column_push_padding (GtkTreeViewColumn  *column,
-                                   gint                padding)
+                                   int                 padding)
 {
   column->priv->padding = MAX (column->priv->padding, padding);
 }
 
-gint
+int
 _gtk_tree_view_column_get_requested_width (GtkTreeViewColumn  *column)
 {
-  gint requested_width;
+  int requested_width;
 
   gtk_cell_area_context_get_preferred_width (column->priv->cell_area_context, &requested_width, NULL);
 
   return requested_width + column->priv->padding;
 }
 
-gint
+int
 _gtk_tree_view_column_get_drag_x (GtkTreeViewColumn  *column)
 {
   return column->priv->drag_x;
index c9dc183592a40730ab98ee34291fabd76bca6f67..67b025aedb5c41a573a52b7174cea83c19eb95f7 100644 (file)
@@ -100,7 +100,7 @@ GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_add_attribute       (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  const gchar             *attribute,
-                                                                 gint                     column);
+                                                                 int                      column);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
@@ -116,9 +116,9 @@ void                    gtk_tree_view_column_clear_attributes    (GtkTreeViewCol
                                                                  GtkCellRenderer         *cell_renderer);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_spacing         (GtkTreeViewColumn       *tree_column,
-                                                                 gint                     spacing);
+                                                                 int                      spacing);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_spacing         (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_spacing         (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 visible);
@@ -135,24 +135,24 @@ void                    gtk_tree_view_column_set_sizing          (GtkTreeViewCol
 GDK_AVAILABLE_IN_ALL
 GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_x_offset        (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_x_offset        (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_width           (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_fixed_width     (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_fixed_width     (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_fixed_width     (GtkTreeViewColumn       *tree_column,
-                                                                 gint                     fixed_width);
+                                                                 int                      fixed_width);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_min_width       (GtkTreeViewColumn       *tree_column,
-                                                                 gint                     min_width);
+                                                                 int                      min_width);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_min_width       (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_max_width       (GtkTreeViewColumn       *tree_column,
-                                                                 gint                     max_width);
+                                                                 int                      max_width);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_max_width       (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_clicked             (GtkTreeViewColumn       *tree_column);
 
@@ -198,9 +198,9 @@ gboolean                gtk_tree_view_column_get_reorderable     (GtkTreeViewCol
  */
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_sort_column_id  (GtkTreeViewColumn       *tree_column,
-                                                                 gint                     sort_column_id);
+                                                                 int                      sort_column_id);
 GDK_AVAILABLE_IN_ALL
-gint                    gtk_tree_view_column_get_sort_column_id  (GtkTreeViewColumn       *tree_column);
+int                     gtk_tree_view_column_get_sort_column_id  (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_set_sort_indicator  (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 setting);
@@ -235,8 +235,8 @@ void                    gtk_tree_view_column_focus_cell          (GtkTreeViewCol
 GDK_AVAILABLE_IN_ALL
 gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
-                                                                 gint                    *x_offset,
-                                                                 gint                    *width);
+                                                                 int                     *x_offset,
+                                                                 int                     *width);
 GDK_AVAILABLE_IN_ALL
 void                    gtk_tree_view_column_queue_resize        (GtkTreeViewColumn       *tree_column);
 GDK_AVAILABLE_IN_ALL
index 85a79f554fbf81e40be1a689c6490c55d7a5588a..badbba2f55e3ee1cf3703bc858df1a385a28d2b3 100644 (file)
@@ -79,8 +79,8 @@ enum
 };
 
 static gboolean cb_query_tooltip (GtkWidget       *button,
-                                  gint             x,
-                                  gint             y,
+                                  int              x,
+                                  int              y,
                                   gboolean         keyboard_mode,
                                   GtkTooltip      *tooltip,
                                   gpointer         user_data);
@@ -214,8 +214,8 @@ gtk_volume_button_new (void)
 
 static gboolean
 cb_query_tooltip (GtkWidget  *button,
-                  gint        x,
-                  gint        y,
+                  int         x,
+                  int         y,
                   gboolean    keyboard_mode,
                   GtkTooltip *tooltip,
                   gpointer    user_data)
index 06f95b3e862900df59386d5140d7bf8373472d43..df02699f0778a844e472870dd4d1482441c2d356 100644 (file)
@@ -548,7 +548,7 @@ struct _GtkStateData
   guint         flags_to_set;
   guint         flags_to_unset;
 
-  gint          old_scale_factor;
+  int           old_scale_factor;
 };
 
 /* --- prototypes --- */
@@ -584,8 +584,8 @@ static void gtk_widget_real_direction_changed(GtkWidget         *widget,
                                                   GtkTextDirection   previous_direction);
 
 static gboolean gtk_widget_real_query_tooltip    (GtkWidget         *widget,
-                                                 gint               x,
-                                                 gint               y,
+                                                 int                x,
+                                                 int                y,
                                                  gboolean           keyboard_tip,
                                                  GtkTooltip        *tooltip);
 static void     gtk_widget_real_css_changed      (GtkWidget         *widget,
@@ -659,8 +659,8 @@ static GtkSizeRequestMode gtk_widget_real_get_request_mode      (GtkWidget
 static void                  template_data_free                 (GtkWidgetTemplate*template_data);
 
 static void gtk_widget_set_usize_internal (GtkWidget          *widget,
-                                          gint                width,
-                                          gint                height);
+                                          int                 width,
+                                          int                 height);
 
 static gboolean event_surface_is_still_viewable (GdkEvent *event);
 
@@ -673,7 +673,7 @@ static void gtk_widget_queue_compute_expand (GtkWidget *widget);
 
 
 /* --- variables --- */
-static gint             GtkWidget_private_offset = 0;
+static int              GtkWidget_private_offset = 0;
 static gpointer         gtk_widget_parent_class = NULL;
 static guint            widget_signals[LAST_SIGNAL] = { 0 };
 GtkTextDirection gtk_default_direction = GTK_TEXT_DIR_LTR;
@@ -2097,7 +2097,7 @@ gtk_widget_needs_press_emulation (GtkWidget        *widget,
   return !sequence_press_handled;
 }
 
-static gint
+static int
 _gtk_widget_set_sequence_state_internal (GtkWidget             *widget,
                                          GdkEventSequence      *sequence,
                                          GtkEventSequenceState  state,
@@ -2109,7 +2109,7 @@ _gtk_widget_set_sequence_state_internal (GtkWidget             *widget,
   GtkWidget *target;
   GList *group = NULL;
   GdkEventSequence *seq;
-  gint n_handled = 0;
+  int n_handled = 0;
   guint i;
 
   if (state != GTK_EVENT_SEQUENCE_CLAIMED &&
@@ -3582,7 +3582,7 @@ gtk_widget_get_frame_clock (GtkWidget *widget)
     }
 }
 
-static gint
+static int
 get_number (GtkCssValue *value)
 {
   double d = _gtk_css_number_value_get (value, 100);
@@ -3672,9 +3672,9 @@ effective_align (GtkAlign         align,
 
 static void
 adjust_for_align (GtkAlign  align,
-                  gint      natural_size,
-                  gint     *allocated_pos,
-                  gint     *allocated_size)
+                  int       natural_size,
+                  int      *allocated_pos,
+                  int      *allocated_size)
 {
   switch (align)
     {
@@ -3709,8 +3709,8 @@ gtk_widget_adjust_size_allocation (GtkWidget     *widget,
                                    GtkAllocation *allocation)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  gint natural_width, natural_height;
-  gint min_width, min_height;
+  int natural_width, natural_height;
+  int min_width, min_height;
 
   if (priv->halign == GTK_ALIGN_FILL && priv->valign == GTK_ALIGN_FILL)
     return;
@@ -3969,8 +3969,8 @@ gtk_widget_common_ancestor (GtkWidget *widget_a,
 {
   GtkWidget *parent_a;
   GtkWidget *parent_b;
-  gint depth_a = 0;
-  gint depth_b = 0;
+  int depth_a = 0;
+  int depth_b = 0;
 
   parent_a = widget_a;
   while (parent_a->priv->parent)
@@ -4636,8 +4636,8 @@ gtk_widget_grab_focus_child (GtkWidget *widget)
 
 static gboolean
 gtk_widget_real_query_tooltip (GtkWidget  *widget,
-                              gint        x,
-                              gint        y,
+                              int         x,
+                              int         y,
                               gboolean    keyboard_tip,
                               GtkTooltip *tooltip)
 {
@@ -4660,8 +4660,8 @@ gtk_widget_real_query_tooltip (GtkWidget  *widget,
 
 gboolean
 gtk_widget_query_tooltip (GtkWidget  *widget,
-                          gint        x,
-                          gint        y,
+                          int         x,
+                          int         y,
                           gboolean    keyboard_mode,
                           GtkTooltip *tooltip)
 {
@@ -6462,7 +6462,7 @@ _gtk_widget_scale_changed (GtkWidget *widget)
  *
  * Returns: the scale factor for @widget
  */
-gint
+int
 gtk_widget_get_scale_factor (GtkWidget *widget)
 {
   GtkRoot *root;
@@ -6655,8 +6655,8 @@ gtk_widget_error_bell (GtkWidget *widget)
 
 static void
 gtk_widget_set_usize_internal (GtkWidget          *widget,
-                              gint                width,
-                              gint                height)
+                              int                 width,
+                              int                 height)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
   gboolean changed = FALSE;
@@ -6723,8 +6723,8 @@ gtk_widget_set_usize_internal (GtkWidget          *widget,
  **/
 void
 gtk_widget_set_size_request (GtkWidget *widget,
-                             gint       width,
-                             gint       height)
+                             int        width,
+                             int        height)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
   g_return_if_fail (width >= -1);
@@ -6750,8 +6750,8 @@ gtk_widget_set_size_request (GtkWidget *widget,
  **/
 void
 gtk_widget_get_size_request (GtkWidget *widget,
-                             gint      *width,
-                             gint      *height)
+                             int       *width,
+                             int       *height)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
@@ -7427,8 +7427,8 @@ gtk_widget_real_unrealize (GtkWidget *widget)
 void
 gtk_widget_adjust_size_request (GtkWidget      *widget,
                                 GtkOrientation  orientation,
-                                gint           *minimum_size,
-                                gint           *natural_size)
+                                int            *minimum_size,
+                                int            *natural_size)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
@@ -7457,8 +7457,8 @@ gtk_widget_adjust_size_request (GtkWidget      *widget,
 
 void
 gtk_widget_adjust_baseline_request (GtkWidget *widget,
-                                    gint      *minimum_baseline,
-                                    gint      *natural_baseline)
+                                    int       *minimum_baseline,
+                                    int       *natural_baseline)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
@@ -7564,7 +7564,7 @@ gtk_widget_propagate_state (GtkWidget          *widget,
   GtkStateFlags new_flags, old_flags = priv->state_flags;
   GtkStateData child_data;
   GtkWidget *child;
-  gint new_scale_factor = gtk_widget_get_scale_factor (widget);
+  int new_scale_factor = gtk_widget_get_scale_factor (widget);
 
   priv->state_flags |= data->flags_to_set;
   priv->state_flags &= ~(data->flags_to_unset);
@@ -7996,8 +7996,8 @@ gtk_widget_set_expand (GtkWidget     *widget,
                        gboolean       expand)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  gint expand_prop;
-  gint expand_set_prop;
+  int expand_prop;
+  int expand_set_prop;
 
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
@@ -8042,7 +8042,7 @@ gtk_widget_set_expand_set (GtkWidget      *widget,
                            gboolean        set)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  gint prop;
+  int prop;
 
   set = set != FALSE;
 
@@ -8393,8 +8393,8 @@ typedef struct
 {
   gchar *target;
   AtkRelationType type;
-  gint line;
-  gint col;
+  int line;
+  int col;
 } AtkRelationData;
 
 static void
@@ -8955,7 +8955,7 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable,
        {
          AtkObject *accessible;
          AtkAction *action;
-         gint i, n_actions;
+         int i, n_actions;
          GSList *l;
 
          accessible = gtk_widget_get_accessible (GTK_WIDGET (buildable));
@@ -9156,7 +9156,7 @@ gtk_widget_set_valign (GtkWidget *widget,
  *
  * Returns: The start margin of @widget
  */
-gint
+int
 gtk_widget_get_margin_start (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
@@ -9176,7 +9176,7 @@ gtk_widget_get_margin_start (GtkWidget *widget)
  */
 void
 gtk_widget_set_margin_start (GtkWidget *widget,
-                             gint       margin)
+                             int        margin)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
@@ -9201,7 +9201,7 @@ gtk_widget_set_margin_start (GtkWidget *widget,
  *
  * Returns: The end margin of @widget
  */
-gint
+int
 gtk_widget_get_margin_end (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
@@ -9221,7 +9221,7 @@ gtk_widget_get_margin_end (GtkWidget *widget)
  */
 void
 gtk_widget_set_margin_end (GtkWidget *widget,
-                           gint       margin)
+                           int        margin)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
@@ -9246,7 +9246,7 @@ gtk_widget_set_margin_end (GtkWidget *widget,
  *
  * Returns: The top margin of @widget
  */
-gint
+int
 gtk_widget_get_margin_top (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
@@ -9266,7 +9266,7 @@ gtk_widget_get_margin_top (GtkWidget *widget)
  */
 void
 gtk_widget_set_margin_top (GtkWidget *widget,
-                           gint       margin)
+                           int        margin)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
@@ -9289,7 +9289,7 @@ gtk_widget_set_margin_top (GtkWidget *widget,
  *
  * Returns: The bottom margin of @widget
  */
-gint
+int
 gtk_widget_get_margin_bottom (GtkWidget *widget)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
@@ -9309,7 +9309,7 @@ gtk_widget_get_margin_bottom (GtkWidget *widget)
  */
 void
 gtk_widget_set_margin_bottom (GtkWidget *widget,
-                              gint       margin)
+                              int        margin)
 {
   GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
 
index cf812b9b26af3988c5e407c1dd65c33ff17f7cb9..afebe810376531b8f8f3f1f633fca5fac5eae57b 100644 (file)
@@ -108,8 +108,8 @@ typedef gboolean (*GtkTickCallback) (GtkWidget     *widget,
  */
 struct _GtkRequisition
 {
-  gint width;
-  gint height;
+  int width;
+  int height;
 };
 
 /* The widget is the base of the tree for displayable objects.
@@ -256,8 +256,8 @@ struct _GtkWidgetClass
   AtkObject *  (* get_accessible)     (GtkWidget       *widget);
 
   gboolean     (* query_tooltip)      (GtkWidget  *widget,
-                                       gint        x,
-                                       gint        y,
+                                       int         x,
+                                       int         y,
                                        gboolean    keyboard_tooltip,
                                        GtkTooltip *tooltip);
 
@@ -529,12 +529,12 @@ void       gtk_widget_error_bell          (GtkWidget           *widget);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_size_request    (GtkWidget           *widget,
-                                           gint                 width,
-                                           gint                 height);
+                                           int                  width,
+                                           int                  height);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_get_size_request    (GtkWidget           *widget,
-                                           gint                *width,
-                                           gint                *height);
+                                           int                 *width,
+                                           int                 *height);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_opacity         (GtkWidget           *widget,
                                            double               opacity);
@@ -551,7 +551,7 @@ GtkWidget*   gtk_widget_get_ancestor    (GtkWidget      *widget,
                                          GType           widget_type);
 
 GDK_AVAILABLE_IN_ALL
-gint          gtk_widget_get_scale_factor (GtkWidget *widget);
+int           gtk_widget_get_scale_factor (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *  gtk_widget_get_display     (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
@@ -610,25 +610,25 @@ GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_valign        (GtkWidget *widget,
                                        GtkAlign   align);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_widget_get_margin_start  (GtkWidget *widget);
+int      gtk_widget_get_margin_start  (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_start  (GtkWidget *widget,
-                                       gint       margin);
+                                       int        margin);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_widget_get_margin_end    (GtkWidget *widget);
+int      gtk_widget_get_margin_end    (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_end    (GtkWidget *widget,
-                                       gint       margin);
+                                       int        margin);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_widget_get_margin_top    (GtkWidget *widget);
+int      gtk_widget_get_margin_top    (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_top    (GtkWidget *widget,
-                                       gint       margin);
+                                       int        margin);
 GDK_AVAILABLE_IN_ALL
-gint     gtk_widget_get_margin_bottom (GtkWidget *widget);
+int      gtk_widget_get_margin_bottom (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 void     gtk_widget_set_margin_bottom (GtkWidget *widget,
-                                       gint       margin);
+                                       int        margin);
 
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_is_ancestor     (GtkWidget      *widget,
index d674b9867d19bfe91cd57d5c15a046eb69c25256..47b3a531d777e4208f4cc371b51dd4ea4ec24b05 100644 (file)
@@ -150,7 +150,7 @@ struct _GtkWidgetPrivate
   GskTransform *allocated_transform;
   int allocated_width;
   int allocated_height;
-  gint allocated_size_baseline;
+  int allocated_size_baseline;
 
   GskTransform *transform;
   int width;
@@ -289,8 +289,8 @@ GtkEventController **gtk_widget_list_controllers           (GtkWidget
                                                             guint               *out_n_controllers);
 
 gboolean          gtk_widget_query_tooltip                 (GtkWidget  *widget,
-                                                            gint        x,
-                                                            gint        y,
+                                                            int         x,
+                                                            int         y,
                                                             gboolean    keyboard_mode,
                                                             GtkTooltip *tooltip);
 
@@ -298,11 +298,11 @@ void              gtk_widget_snapshot                      (GtkWidget
                                                             GtkSnapshot          *snapshot);
 void              gtk_widget_adjust_size_request           (GtkWidget      *widget,
                                                             GtkOrientation  orientation,
-                                                            gint           *minimum_size,
-                                                            gint           *natural_size);
+                                                            int            *minimum_size,
+                                                            int            *natural_size);
 void              gtk_widget_adjust_baseline_request       (GtkWidget *widget,
-                                                            gint      *minimum_baseline,
-                                                            gint      *natural_baseline);
+                                                            int       *minimum_baseline,
+                                                            int       *natural_baseline);
 
 void              gtk_widget_forall                        (GtkWidget            *widget,
                                                             GtkCallback           callback,
index c2591b90c160ac2f12231c319334b61a11fa3bec..84042052eb11d9ccab74b1872a681fc3d4e91c4c 100644 (file)
@@ -196,9 +196,9 @@ typedef struct
 
   guint    focus_visible_timeout;
 
-  gint     scale;
+  int      scale;
 
-  gint title_height;
+  int title_height;
   GtkWidget *title_box;
   GtkWidget *titlebar;
   GtkWidget *key_press_focus;
@@ -336,14 +336,14 @@ struct _GtkWindowGeometryInfo
   /* from last gtk_window_resize () - if > 0, indicates that
    * we should resize to this size.
    */
-  gint           resize_width;  
-  gint           resize_height;
+  int            resize_width;  
+  int            resize_height;
 
   /* Default size - used only the FIRST time we map a window,
    * only if > 0.
    */
-  gint           default_width; 
-  gint           default_height;
+  int            default_width; 
+  int            default_height;
 
   GtkWindowLastGeometryInfo last;
 };
@@ -389,7 +389,7 @@ static gboolean surface_event             (GdkSurface         *surface,
                                            GdkEvent           *event,
                                            GtkWidget          *widget);
 
-static gint gtk_window_focus              (GtkWidget        *widget,
+static int gtk_window_focus              (GtkWidget        *widget,
                                           GtkDirectionType  direction);
 static void gtk_window_move_focus         (GtkWidget         *widget,
                                            GtkDirectionType   dir);
@@ -416,14 +416,14 @@ static gboolean gtk_window_compare_hints             (GdkGeometry  *geometry_a,
 static void     gtk_window_constrain_size            (GtkWindow    *window,
                                                       GdkGeometry  *geometry,
                                                       guint         flags,
-                                                      gint          width,
-                                                      gint          height,
-                                                      gint         *new_width,
-                                                      gint         *new_height);
+                                                      int           width,
+                                                      int           height,
+                                                      int          *new_width,
+                                                      int          *new_height);
 static void     gtk_window_update_fixed_size         (GtkWindow    *window,
                                                       GdkGeometry  *new_geometry,
-                                                      gint          new_width,
-                                                      gint          new_height);
+                                                      int           new_width,
+                                                      int           new_height);
 static void     gtk_window_compute_hints             (GtkWindow    *window,
                                                       GdkGeometry  *new_geometry,
                                                       guint        *new_flags);
@@ -434,9 +434,9 @@ static void     gtk_window_compute_configure_request (GtkWindow    *window,
 
 static void     gtk_window_set_default_size_internal (GtkWindow    *window,
                                                       gboolean      change_width,
-                                                      gint          width,
+                                                      int           width,
                                                       gboolean      change_height,
-                                                      gint          height);
+                                                      int           height);
 
 static void     update_themed_icon                    (GtkWindow    *window);
 static GList   *icon_list_from_theme                  (GtkWindow    *window,
@@ -1210,7 +1210,7 @@ constraints_for_edge (GdkSurfaceEdge edge)
     }
 }
 
-static gint
+static int
 get_number (GtkCssValue *value)
 {
   double d = _gtk_css_number_value_get (value, 100);
@@ -1321,7 +1321,7 @@ get_edge_for_coordinates (GtkWindow *window,
 
 static void
 click_gesture_pressed_cb (GtkGestureClick *gesture,
-                          gint             n_press,
+                          int              n_press,
                           gdouble          x,
                           gdouble          y,
                           GtkWindow       *window)
@@ -3063,8 +3063,8 @@ icon_list_from_theme (GtkWindow   *window,
   GtkIconTheme *icon_theme;
   GtkIconPaintable *info;
   GdkTexture *texture;
-  gint *sizes;
-  gint i;
+  int *sizes;
+  int i;
 
   icon_theme = gtk_icon_theme_get_for_display (priv->display);
 
@@ -3311,13 +3311,13 @@ gtk_window_get_default_icon_name (void)
 
 static void
 gtk_window_update_csd_size (GtkWindow *window,
-                            gint      *width,
-                            gint      *height,
-                            gint       apply)
+                            int       *width,
+                            int       *height,
+                            int        apply)
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkBorder window_border = { 0 };
-  gint w, h;
+  int w, h;
 
   if (!priv->decorated ||
       priv->fullscreen)
@@ -3331,8 +3331,8 @@ gtk_window_update_csd_size (GtkWindow *window,
       gtk_widget_get_visible (priv->title_box) &&
       gtk_widget_get_child_visible (priv->title_box))
     {
-      gint minimum_height;
-      gint natural_height;
+      int minimum_height;
+      int natural_height;
 
       gtk_widget_measure (priv->title_box, GTK_ORIENTATION_VERTICAL, -1,
                           &minimum_height, &natural_height,
@@ -3356,9 +3356,9 @@ gtk_window_update_csd_size (GtkWindow *window,
 static void
 gtk_window_set_default_size_internal (GtkWindow    *window,
                                       gboolean      change_width,
-                                      gint          width,
+                                      int           width,
                                       gboolean      change_height,
-                                      gint          height)
+                                      int           height)
 {
   GtkWindowGeometryInfo *info;
 
@@ -3440,8 +3440,8 @@ gtk_window_set_default_size_internal (GtkWindow    *window,
  */
 void
 gtk_window_set_default_size (GtkWindow   *window,
-                            gint         width,
-                            gint         height)
+                            int          width,
+                            int          height)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
   g_return_if_fail (width >= -1);
@@ -3464,8 +3464,8 @@ gtk_window_set_default_size (GtkWindow   *window,
  **/
 void
 gtk_window_get_default_size (GtkWindow *window,
-                            gint      *width,
-                            gint      *height)
+                            int       *width,
+                            int       *height)
 {
   GtkWindowGeometryInfo *info;
 
@@ -3518,8 +3518,8 @@ gtk_window_get_default_size (GtkWindow *window,
  **/
 void
 gtk_window_resize (GtkWindow *window,
-                   gint       width,
-                   gint       height)
+                   int        width,
+                   int        height)
 {
   GtkWindowGeometryInfo *info;
   
@@ -3608,11 +3608,11 @@ gtk_window_resize (GtkWindow *window,
  */
 void
 gtk_window_get_size (GtkWindow *window,
-                     gint      *width,
-                     gint      *height)
+                     int       *width,
+                     int       *height)
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-  gint w, h;
+  int w, h;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
@@ -4010,8 +4010,8 @@ gtk_window_unmap (GtkWidget *widget)
 
 static void
 gtk_window_guess_default_size (GtkWindow *window,
-                               gint      *width,
-                               gint      *height)
+                               int       *width,
+                               int       *height)
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkWidget *widget;
@@ -5211,8 +5211,8 @@ _gtk_window_unset_focus_and_default (GtkWindow *window,
 static void
 gtk_window_compute_configure_request_size (GtkWindow   *window,
                                            guint        flags,
-                                           gint        *width,
-                                           gint        *height)
+                                           int         *width,
+                                           int         *height)
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkWindowGeometryInfo *info;
@@ -5236,8 +5236,8 @@ gtk_window_compute_configure_request_size (GtkWindow   *window,
           /* Take width of shadows/headerbar into account. We want to set the
            * default size of the content area and not the window area.
            */
-          gint default_width_csd = info->default_width;
-          gint default_height_csd = info->default_height;
+          int default_width_csd = info->default_width;
+          int default_height_csd = info->default_height;
           gtk_window_update_csd_size (window,
                                       &default_width_csd, &default_height_csd,
                                       INCLUDE_CSD_SIZE);
@@ -5262,8 +5262,8 @@ gtk_window_compute_configure_request_size (GtkWindow   *window,
     }
   else if (info)
     {
-      gint resize_width_csd = info->resize_width;
-      gint resize_height_csd = info->resize_height;
+      int resize_width_csd = info->resize_width;
+      int resize_height_csd = info->resize_height;
       gtk_window_update_csd_size (window,
                                   &resize_width_csd, &resize_height_csd,
                                   INCLUDE_CSD_SIZE);
@@ -5681,10 +5681,10 @@ static void
 gtk_window_constrain_size (GtkWindow   *window,
                           GdkGeometry *geometry,
                           guint        flags,
-                          gint         width,
-                          gint         height,
-                          gint        *new_width,
-                          gint        *new_height)
+                          int          width,
+                          int          height,
+                          int         *new_width,
+                          int         *new_height)
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   guint geometry_flags;
@@ -5711,8 +5711,8 @@ gtk_window_constrain_size (GtkWindow   *window,
 static void
 gtk_window_update_fixed_size (GtkWindow   *window,
                               GdkGeometry *new_geometry,
-                              gint         new_width,
-                              gint         new_height)
+                              int          new_width,
+                              int          new_height)
 {
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkWindowGeometryInfo *info;
@@ -5726,8 +5726,8 @@ gtk_window_update_fixed_size (GtkWindow   *window,
   info = gtk_window_get_geometry_info (window, FALSE);
   if (info)
     {
-      gint default_width_csd = info->default_width;
-      gint default_height_csd = info->default_height;
+      int default_width_csd = info->default_width;
+      int default_height_csd = info->default_height;
 
       gtk_window_update_csd_size (window,
                                   &default_width_csd, &default_height_csd,
@@ -5735,14 +5735,14 @@ gtk_window_update_fixed_size (GtkWindow   *window,
 
       if (info->default_width > -1)
         {
-          gint w = MAX (MAX (default_width_csd, new_width), new_geometry->min_width);
+          int w = MAX (MAX (default_width_csd, new_width), new_geometry->min_width);
           new_geometry->min_width = w;
           new_geometry->max_width = w;
         }
 
       if (info->default_height > -1)
         {
-          gint h = MAX (MAX (default_height_csd, new_height), new_geometry->min_height);
+          int h = MAX (MAX (default_height_csd, new_height), new_geometry->min_height);
           new_geometry->min_height = h;
           new_geometry->max_height = h;
         }
@@ -6596,7 +6596,7 @@ static void gtk_window_set_debugging (GdkDisplay *display,
 
 static void
 warn_response (GtkDialog *dialog,
-               gint       response)
+               int        response)
 {
   GtkWidget *check;
   gboolean remember;
index b64c11ee7ef94b8331ca26bbe500ddde92a454ae..ba9db9d501dc536c0653f53db49559efa46fbc77 100644 (file)
@@ -209,20 +209,20 @@ void     gtk_window_close         (GtkWindow *window);
  */
 GDK_AVAILABLE_IN_ALL
 void     gtk_window_set_default_size (GtkWindow   *window,
-                                      gint         width,
-                                      gint         height);
+                                      int          width,
+                                      int          height);
 GDK_AVAILABLE_IN_ALL
 void     gtk_window_get_default_size (GtkWindow   *window,
-                                      gint        *width,
-                                      gint        *height);
+                                      int         *width,
+                                      int         *height);
 GDK_AVAILABLE_IN_ALL
 void     gtk_window_resize           (GtkWindow   *window,
-                                      gint         width,
-                                      gint         height);
+                                      int          width,
+                                      int          height);
 GDK_AVAILABLE_IN_ALL
 void     gtk_window_get_size         (GtkWindow   *window,
-                                      gint        *width,
-                                      gint        *height);
+                                      int         *width,
+                                      int         *height);
 
 GDK_AVAILABLE_IN_ALL
 GtkWindowGroup *gtk_window_get_group (GtkWindow   *window);
index 9740be43ef9a29b252e5cb7b7146f555f2c9aba0..691fdc8a511a2819eb252d87fc4327a69beedc48 100644 (file)
@@ -265,7 +265,7 @@ static gboolean
 perform_titlebar_action (GtkWindowHandle *self,
                          GdkEvent        *event,
                          guint            button,
-                         gint             n_press)
+                         int              n_press)
 {
   GtkSettings *settings;
   gchar *action = NULL;
index 0819f66f9a3dd21f30c09f0e427a8a211b7c7e43..4402fbfa249328be4267048698bb99c124d761f8 100644 (file)
@@ -258,7 +258,7 @@ static void
 add_group (GtkInspectorActions *sl,
            GActionGroup        *group)
 {
-  gint i;
+  int i;
   gchar **names;
 
   names = g_action_group_list_actions (group);
@@ -271,7 +271,7 @@ static void
 add_muxer (GtkInspectorActions *sl,
            GtkActionMuxer      *muxer)
 {
-  gint i;
+  int i;
   gchar **names;
 
   names = gtk_action_muxer_list_actions (muxer);
index e8570fb7fbd845cf01f73f4dacfb75b3e2badb1f..b702f50dd543f551ceab0d84766de89851035214 100644 (file)
@@ -119,10 +119,10 @@ static void
 gtk_cell_renderer_graph_get_size (GtkCellRenderer    *cell,
                                   GtkWidget          *widget,
                                   const GdkRectangle *cell_area,
-                                  gint               *x_offset,
-                                  gint               *y_offset,
-                                  gint               *width,
-                                  gint               *height)
+                                  int                *x_offset,
+                                  int                *y_offset,
+                                  int                *width,
+                                  int                *height)
 {
   int xpad, ypad;
 
index e30a6184b07346690d2ea1fbcf4b5c373d50ff97..2a45b731684cbde2172504908156bf4e4b7fc4dc 100644 (file)
@@ -66,8 +66,8 @@ css_error_free (gpointer data)
 
 static gboolean
 query_tooltip_cb (GtkWidget             *widget,
-                  gint                   x,
-                  gint                   y,
+                  int                    x,
+                  int                    y,
                   gboolean               keyboard_tip,
                   GtkTooltip            *tooltip,
                   GtkInspectorCssEditor *ce)
@@ -77,14 +77,14 @@ query_tooltip_cb (GtkWidget             *widget,
 
   if (keyboard_tip)
     {
-      gint offset;
+      int offset;
 
       g_object_get (ce->priv->text, "cursor-position", &offset, NULL);
       gtk_text_buffer_get_iter_at_offset (ce->priv->text, &iter, offset);
     }
   else
     {
-      gint bx, by, trailing;
+      int bx, by, trailing;
 
       gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (ce->priv->view), GTK_TEXT_WINDOW_TEXT,
                                              x, y, &bx, &by);
@@ -221,7 +221,7 @@ save_to_file (GtkInspectorCssEditor *ce,
 
 static void
 save_response (GtkWidget             *dialog,
-               gint                   response,
+               int                    response,
                GtkInspectorCssEditor *ce)
 {
   gtk_widget_hide (dialog);
index 3fb1221b17d57a9c7783abd3bfe825dcd4655d6a..31dccb43b47e706682f05c1fe890010264413683 100644 (file)
@@ -282,7 +282,7 @@ format_state_flags (GtkStateFlags state)
   if (state)
     {
       GString *str;
-      gint i;
+      int i;
       gboolean first = TRUE;
 
       str = g_string_new ("");
@@ -348,7 +348,7 @@ static void
 gtk_inspector_css_node_tree_init (GtkInspectorCssNodeTree *cnt)
 {
   GtkInspectorCssNodeTreePrivate *priv;
-  gint i;
+  int i;
 
   cnt->priv = gtk_inspector_css_node_tree_get_instance_private (cnt);
   gtk_widget_init_template (GTK_WIDGET (cnt));
@@ -433,7 +433,7 @@ gtk_inspector_css_node_tree_update_style (GtkInspectorCssNodeTree *cnt,
                                           GtkCssStyle             *new_style)
 {
   GtkInspectorCssNodeTreePrivate *priv = cnt->priv;
-  gint i;
+  int i;
 
   for (i = 0; i < _gtk_css_style_property_get_n_properties (); i++)
     {
index 2a5b304d0952cceefe7b4003e5d077122739e361..243e6d93695b4107ebfa9cde0ba6f7e9d4f3656b 100644 (file)
@@ -166,7 +166,7 @@ add_check_row (GtkInspectorGeneral *gen,
                GtkListBox          *list,
                const gchar         *name,
                gboolean             value,
-               gint                 indent)
+               int                  indent)
 {
   GtkWidget *row, *box, *label, *check;
 
@@ -206,7 +206,7 @@ add_label_row (GtkInspectorGeneral *gen,
                GtkListBox          *list,
                const char          *name,
                const char          *value,
-               gint                 indent)
+               int                  indent)
 {
   GtkWidget *box;
   GtkWidget *label;
@@ -566,7 +566,7 @@ populate_monitor (gpointer item,
   gchar *name;
   gchar *value;
   GdkRectangle rect;
-  gint scale;
+  int scale;
   char *scale_str = NULL;
   const char *manufacturer;
   const char *model;
index 0af42b167f5bebed4c02eaea380184aa11b80106..e6d87dc98524bdb2d8b1fa7183d67edff2ff1cca 100644 (file)
@@ -23,7 +23,7 @@
 struct _GtkTreeModelCssNodePrivate
 {
   GtkTreeModelCssNodeGetFunc    get_func;
-  gint                          n_columns;
+  int                           n_columns;
   GType                        *column_types;
 
   GtkCssNode                   *root;
@@ -48,7 +48,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkTreeModelCssNode, gtk_tree_model_css_node, G_TYPE_OB
 
 static GtkCssNode *
 get_nth_child (GtkCssNode *node,
-               gint        i)
+               int         i)
 {
   for (node = gtk_css_node_get_first_child (node);
        node != NULL && i > 0;
@@ -75,7 +75,7 @@ gtk_tree_model_css_node_get_flags (GtkTreeModel *tree_model)
   return GTK_TREE_MODEL_ITERS_PERSIST;
 }
 
-static gint
+static int
 gtk_tree_model_css_node_get_n_columns (GtkTreeModel *tree_model)
 {
   GtkTreeModelCssNode *nodemodel = GTK_TREE_MODEL_CSS_NODE (tree_model);
@@ -86,7 +86,7 @@ gtk_tree_model_css_node_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 gtk_tree_model_css_node_get_column_type (GtkTreeModel *tree_model,
-                                         gint          column)
+                                         int           column)
 {
   GtkTreeModelCssNode *nodemodel = GTK_TREE_MODEL_CSS_NODE (tree_model);
   GtkTreeModelCssNodePrivate *priv = nodemodel->priv;
@@ -156,7 +156,7 @@ gtk_tree_model_css_node_get_path (GtkTreeModel *tree_model,
 static void
 gtk_tree_model_css_node_get_value (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
-                                   gint          column,
+                                   int           column,
                                    GValue       *value)
 {
   GtkTreeModelCssNode *nodemodel = GTK_TREE_MODEL_CSS_NODE (tree_model);
@@ -246,7 +246,7 @@ gtk_tree_model_css_node_iter_has_child (GtkTreeModel *tree_model,
   return gtk_css_node_get_first_child (node) != NULL;
 }
 
-static gint
+static int
 gtk_tree_model_css_node_iter_n_children (GtkTreeModel *tree_model,
                                          GtkTreeIter  *iter)
 {
@@ -270,7 +270,7 @@ static gboolean
 gtk_tree_model_css_node_iter_nth_child (GtkTreeModel *tree_model,
                                         GtkTreeIter  *iter,
                                         GtkTreeIter  *parent,
-                                        gint          n)
+                                        int           n)
 {
   GtkTreeModelCssNode *nodemodel = GTK_TREE_MODEL_CSS_NODE (tree_model);
   GtkTreeModelCssNodePrivate *priv = nodemodel->priv;
@@ -364,13 +364,13 @@ gtk_tree_model_css_node_init (GtkTreeModelCssNode *nodemodel)
 
 GtkTreeModel *
 gtk_tree_model_css_node_new (GtkTreeModelCssNodeGetFunc get_func,
-                             gint                       n_columns,
+                             int                        n_columns,
                             ...)
 {
   GtkTreeModel *result;
   va_list args;
   GType *types;
-  gint i;
+  int i;
 
   g_return_val_if_fail (get_func != NULL, NULL);
   g_return_val_if_fail (n_columns > 0, NULL);
@@ -394,7 +394,7 @@ gtk_tree_model_css_node_new (GtkTreeModelCssNodeGetFunc get_func,
 
 GtkTreeModel *
 gtk_tree_model_css_node_newv (GtkTreeModelCssNodeGetFunc  get_func,
-                              gint                        n_columns,
+                              int                         n_columns,
                              GType                      *types)
 {
   GtkTreeModelCssNode *result;
index d6cabe14c7e4a654e26009e5caf896ae671ba448..efb3cce9c15525c73224da900e2346603d7949d6 100644 (file)
@@ -58,10 +58,10 @@ struct _GtkTreeModelCssNodeClass
 GType         gtk_tree_model_css_node_get_type          (void) G_GNUC_CONST;
 
 GtkTreeModel *gtk_tree_model_css_node_new               (GtkTreeModelCssNodeGetFunc get_func,
-                                                         gint            n_columns,
+                                                         int             n_columns,
                                                         ...);
 GtkTreeModel *gtk_tree_model_css_node_newv              (GtkTreeModelCssNodeGetFunc get_func,
-                                                         gint            n_columns,
+                                                         int             n_columns,
                                                         GType          *types);
 
 void          gtk_tree_model_css_node_set_root_node     (GtkTreeModelCssNode    *model,
index 589fe8e815aff8a16c2d7355cd7fd3d306745ede..74f4084084a2e75829ba9604f487214760f67c05 100644 (file)
@@ -20,7 +20,7 @@ struct _GtkLayoutOverlayClass
 G_DEFINE_TYPE (GtkLayoutOverlay, gtk_layout_overlay, GTK_TYPE_INSPECTOR_OVERLAY)
 
 
-static gint
+static int
 get_number (GtkCssValue *value)
 {
   double d = _gtk_css_number_value_get (value, 100);
index 33744189428ab1ed8d952c5425c87de55bc4f63a..fb7a78d3184c273b5296a03ce1b27144415c60f6 100644 (file)
@@ -58,7 +58,7 @@ static void
 add_item (GtkInspectorMenu *sl,
           GtkStackPage     *page,
           GMenuModel       *menu,
-          gint              idx,
+          int               idx,
           GtkTreeIter      *parent)
 {
   GtkTreeIter iter;
@@ -117,8 +117,8 @@ add_menu (GtkInspectorMenu *sl,
           GMenuModel       *menu,
           GtkTreeIter      *parent)
 {
-  gint n_items;
-  gint i;
+  int n_items;
+  int i;
 
   g_object_set (page, "visible", TRUE, NULL);
 
index 38350eb2ad75a17fee2640dd4abbce1b84726d55..72621786f194a805cf2890e2dcbbdb095a5ca4f0 100644 (file)
@@ -103,7 +103,7 @@ format_state_flags (GtkStateFlags state)
 {
   GFlagsClass *fclass;
   GString *str;
-  gint i;
+  int i;
 
   str = g_string_new ("");
 
index 5ce78cec3ad061f8341d11ccb1b72d24f8ce67d2..8dcc463b6739b01c33216e4c976ec66d862b551c 100644 (file)
@@ -468,7 +468,7 @@ enum_changed (GObject *object, GParamSpec *pspec, gpointer data)
 {
   GValue val = G_VALUE_INIT;
   GEnumClass *eclass;
-  gint i;
+  int i;
 
   eclass = G_ENUM_CLASS (g_type_class_peek (pspec->value_type));
 
@@ -495,7 +495,7 @@ flags_modified (GtkCheckButton *button, ObjectProperty *p)
   gboolean active;
   GFlagsClass *fclass;
   guint flags;
-  gint i;
+  int i;
   GValue val = G_VALUE_INIT;
 
   active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
@@ -552,7 +552,7 @@ flags_changed (GObject *object, GParamSpec *pspec, gpointer data)
   GValue val = G_VALUE_INIT;
   GFlagsClass *fclass;
   guint flags;
-  gint i;
+  int i;
   GtkPopover *popover;
   GtkWidget *sw;
   GtkWidget *viewport;
@@ -622,7 +622,7 @@ unichar_changed (GObject *object, GParamSpec *pspec, gpointer data)
   gunichar old_val = unichar_get_value (entry);
   GValue val = G_VALUE_INIT;
   gchar buf[7];
-  gint len;
+  int len;
 
   g_value_init (&val, pspec->value_type);
   get_property_value (object, pspec, &val);
@@ -940,7 +940,7 @@ property_editor (GObject                *object,
       {
         GEnumClass *eclass;
         char **names;
-        gint j;
+        int j;
 
         eclass = G_ENUM_CLASS (g_type_class_ref (spec->value_type));
 
@@ -971,7 +971,7 @@ property_editor (GObject                *object,
         GtkWidget *sw;
         GtkWidget *popover;
         GFlagsClass *fclass;
-        gint j;
+        int j;
 
         popover = gtk_popover_new ();
         prop_edit = gtk_menu_button_new ();
@@ -1172,7 +1172,7 @@ attribute_mapping_changed (GtkDropDown            *dropdown,
                            GParamSpec             *pspec,
                            GtkInspectorPropEditor *self)
 {
-  gint col;
+  int col;
   gpointer layout;
   GtkCellRenderer *cell;
   GtkCellArea *area;
@@ -1266,14 +1266,14 @@ attribute_editor (GObject                *object,
   gpointer layout;
   GtkCellArea *area;
   GtkTreeModel *model = NULL;
-  gint col = -1;
+  int col = -1;
   GtkWidget *label;
   GtkWidget *button;
   GtkWidget *box;
   GtkWidget *dropdown;
   GListStore *store;
   GtkListItemFactory *factory;
-  gint i;
+  int i;
   AttributeHolder *holder;
   gboolean sensitive;
 
@@ -1429,7 +1429,7 @@ struct _GSettingsSchemaKey
   GVariant *minimum, *maximum;
   GVariant *default_value;
 
-  gint ref_count;
+  int ref_count;
 };
 
 typedef struct
index 63cf4745c22108ab5d884e255051e606873322a4..386935aed9aa302d86c2b58a9b242394f27524ed 100644 (file)
@@ -84,7 +84,7 @@ load_resources_recurse (const char *path,
                         gsize      *size_out)
 {
   gchar **names;
-  gint i;
+  int i;
   GListStore *result;
 
   result = g_list_store_new (RESOURCE_TYPE_HOLDER);
@@ -92,10 +92,10 @@ load_resources_recurse (const char *path,
   names = g_resources_enumerate_children (path, 0, NULL);
   for (i = 0; names[i]; i++)
     {
-      gint len;
+      int len;
       gchar *p;
       gboolean has_slash;
-      gint count;
+      int count;
       gsize size;
       GListModel *children;
       ResourceHolder *holder;
@@ -306,7 +306,7 @@ close_details (GtkWidget                *button,
 static GListModel *
 load_resources (void)
 {
-  gint count = 0;
+  int count = 0;
   gsize size = 0;
 
   return load_resources_recurse ("/", &count, &size);
index 525f28df8d74c041a77d5ae9e23eb06eb8180bf0..e299fceb3b41b5c117a1fde4c2ca0b6eabb563ae 100644 (file)
@@ -84,14 +84,14 @@ enum
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorStatistics, gtk_inspector_statistics, GTK_TYPE_BOX)
 
-static gint
+static int
 add_type_count (GtkInspectorStatistics *sl, GType type)
 {
-  gint cumulative;
-  gint self;
+  int cumulative;
+  int self;
   GType *children;
   guint n_children;
-  gint i;
+  int i;
   TypeData *data;
 
   cumulative = 0;
@@ -202,8 +202,8 @@ cell_data_data (GtkCellLayout   *layout,
                 GtkTreeIter     *iter,
                 gpointer         data)
 {
-  gint column;
-  gint count;
+  int column;
+  int count;
   gchar *text;
 
   column = GPOINTER_TO_INT (data);
@@ -222,9 +222,9 @@ cell_data_delta (GtkCellLayout   *layout,
                  GtkTreeIter     *iter,
                  gpointer         data)
 {
-  gint column;
-  gint count1;
-  gint count2;
+  int column;
+  int count1;
+  int count2;
   gchar *text;
 
   column = GPOINTER_TO_INT (data);
@@ -304,7 +304,7 @@ match_string (const gchar *string,
 
 static gboolean
 match_row (GtkTreeModel *model,
-           gint          column,
+           int           column,
            const gchar  *key,
            GtkTreeIter  *iter,
            gpointer      data)
index c8b19d6ddadeeef42da1186db8e20be5bbdaa1de..4b0f87fdce2c155e2fcf7c20ea9ab9f5701c2893 100644 (file)
@@ -132,7 +132,7 @@ gtk_inspector_strv_editor_set_strv (GtkInspectorStrvEditor  *editor,
                                     gchar                  **strv)
 {
   GtkWidget *child;
-  gint i;
+  int i;
 
   editor->blocked = TRUE;
 
index fdf77a2cfdc59b376f6ce7f62fce70097bd88432..402cff68a387f59bf2dec416a1ec568134a6ef0a 100644 (file)
@@ -67,7 +67,7 @@ cell_data_func (GtkTreeViewColumn *col,
                 GtkTreeIter       *iter,
                 gpointer           data)
 {
-  gint num;
+  int num;
   GValue gvalue = { 0, };
   gchar *value;
 
@@ -82,12 +82,12 @@ cell_data_func (GtkTreeViewColumn *col,
 static void
 add_columns (GtkInspectorTreeData *sl)
 {
-  gint n_columns;
+  int n_columns;
   GtkCellRenderer *cell;
   GType type;
   gchar *title;
   GtkTreeViewColumn *col;
-  gint i;
+  int i;
 
   n_columns = gtk_tree_model_get_n_columns (sl->object);
   for (i = 0; i < n_columns; i++)
index f14d32cb6113033a340df1eb51848cc6133dcb37..a2c72d9a500517c4727152e9591dba5d576cfb23 100644 (file)
@@ -82,7 +82,7 @@ gtk_inspector_type_popover_set_gtype (GtkInspectorTypePopover *self,
   const gchar *name;
   GType *interfaces;
   GType tmp;
-  gint i;
+  int i;
   GtkWidget *child;
 
   g_return_if_fail (GTK_IS_INSPECTOR_TYPE_POPOVER (self));
index 928b644a4129340c427ba182ab7b23d6ef2d5cd4..28798507cdfc29c24d44b9e77005706d86753e8b 100644 (file)
@@ -209,7 +209,7 @@ update_font_scale (GtkInspectorVisual *vis,
                    gboolean            update_entry)
 {
   g_object_set (gtk_settings_get_for_display (vis->display),
-                "gtk-xft-dpi", (gint)(factor * 96 * 1024),
+                "gtk-xft-dpi", (int)(factor * 96 * 1024),
                 NULL);
 
   if (update_adjustment)
@@ -757,7 +757,7 @@ init_cursors (GtkInspectorVisual *vis)
 static void
 cursor_size_changed (GtkAdjustment *adjustment, GtkInspectorVisual *vis)
 {
-  gint size;
+  int size;
 
   size = gtk_adjustment_get_value (adjustment);
   g_object_set (gtk_settings_get_for_display (vis->display), "gtk-cursor-theme-size", size, NULL);
@@ -766,7 +766,7 @@ cursor_size_changed (GtkAdjustment *adjustment, GtkInspectorVisual *vis)
 static void
 init_cursor_size (GtkInspectorVisual *vis)
 {
-  gint size;
+  int size;
 
   g_object_get (gtk_settings_get_for_display (vis->display), "gtk-cursor-theme-size", &size, NULL);
   if (size == 0)
@@ -803,7 +803,7 @@ init_font_scale (GtkInspectorVisual *vis)
 static void
 scale_changed (GtkAdjustment *adjustment, GtkInspectorVisual *vis)
 {
-  gint scale;
+  int scale;
 
   scale = gtk_adjustment_get_value (adjustment);
   gdk_x11_display_set_surface_scale (vis->display, scale);
index 928c1c5289f494ceba34688945905bf7312d3a0d..ae3bc7e32a96361712adf1db056cb6e64a888edf 100644 (file)
@@ -37,7 +37,7 @@
 
 
 #define TREE_TEXT_SCALE 0.8
-#define TREE_CHECKBOX_SIZE (gint)(0.8 * 13)
+#define TREE_CHECKBOX_SIZE (int)(0.8 * 13)
 
 typedef struct
 {
@@ -89,8 +89,8 @@ typedef struct
   GdkSeat *grab_seat;
 
   GtkInspectorOverlay *flash_overlay;
-  gint flash_count;
-  gint flash_cnx;
+  int flash_count;
+  int flash_cnx;
 
   GArray *objects;
 
index 97125e324745cb9a8d77e7120ca164f8eb9fe0fd..ad67e3b8e8c02ef420b45e4044b0ba1a54b4f9dc 100644 (file)
@@ -72,8 +72,8 @@ load_from_stream (GdkPixbufLoader  *loader,
 
 static void
 size_prepared_cb (GdkPixbufLoader *loader,
-                  gint             width,
-                  gint             height,
+                  int              width,
+                  int              height,
                   gpointer         data)
 {
   gdouble *scale = data;
@@ -120,8 +120,8 @@ _gdk_pixbuf_new_from_stream_scaled (GInputStream  *stream,
 
 static void
 size_prepared_cb2 (GdkPixbufLoader *loader,
-                   gint             width,
-                   gint             height,
+                   int              width,
+                   int              height,
                    gpointer         data)
 {
   int *scales = data;
index 9e4ef118bebe8b47d8901e5ca1ac018d339c8554..45e82753789277da85ee354b4f3ee234e8487e54 100644 (file)
@@ -42,7 +42,7 @@ do_enumerate (int *argc, const char ***argv)
 {
   GtkBuilder *builder;
   GError *error = NULL;
-  gint ret;
+  int ret;
   GSList *list, *l;
   GObject *object;
   const gchar *name;
index 6bc65b50158d2258a6eb8f6de94458e3f8abe7f3..8545d69b007b4634a295be8dacb298e0484b719a 100644 (file)
@@ -191,7 +191,7 @@ needs_explicit_setting (GParamSpec *pspec,
     { "GtkGridLayoutChild", "left-attach", PROP_KIND_LAYOUT },
   };
   gboolean found;
-  gint k;
+  int k;
   const char *class_name;
 
   class_name = g_type_name (pspec->owner_type);
@@ -241,7 +241,7 @@ keep_for_rewrite (const char *class_name,
     { "GtkStack", "needs-attention", PROP_KIND_PACKING },
   };
   gboolean found;
-  gint k;
+  int k;
   char *canonical_name;
 
   canonical_name = g_strdup (property_name);
@@ -629,7 +629,7 @@ static gboolean
 property_can_be_omitted (Element      *element,
                          MyParserData *data)
 {
-  gint i;
+  int i;
   gboolean bound;
   gboolean translatable;
   const char *class_name;
@@ -700,7 +700,7 @@ property_has_been_removed (Element      *element,
   };
   gchar *canonical_name;
   gboolean found;
-  gint i, k;
+  int i, k;
   PropKind kind;
 
   kind = get_prop_kind (element);
index 9b6132e64f88ec375e39e9e08a42a64ed656f6fc..dfdfc005b84beadc5089eb5559602add78acf254 100644 (file)
@@ -61,7 +61,7 @@ do_validate_template (const gchar *filename,
   GObject *object;
   GtkBuilder *builder;
   GError *error = NULL;
-  gint ret;
+  int ret;
 
   /* Only make a fake type if it doesn't exist yet.
    * This lets us e.g. validate the GtkFileChooserWidget template.
@@ -122,7 +122,7 @@ validate_file (const char *filename)
 {
   GtkBuilder *builder;
   GError *error = NULL;
-  gint ret;
+  int ret;
   gchar *class_name = NULL;
   gchar *parent_name = NULL;
 
index 7ad1c10329037bc3604b5dda16b7669499bf0c9a..f449b6d22b158e1682e5ab51f998192524863db2 100644 (file)
@@ -83,7 +83,7 @@ check_string (CacheInfo *info,
 
   if (info->flags & CHECK_STRINGS)
     {
-      gint i;
+      int i;
       gchar c;
 
       /* assume no string is longer than 1k */
@@ -109,7 +109,7 @@ check_string_utf8 (CacheInfo *info,
 
   if (info->flags & CHECK_STRINGS)
     {
-      gint i;
+      int i;
       gchar c;
 
       /* assume no string is longer than 1k */
@@ -132,7 +132,7 @@ check_directory_list (CacheInfo *info,
                       guint32    offset)
 {
   guint32 directory_offset;
-  gint i;
+  int i;
 
   check ("offset, directory list", get_uint32 (info, offset, &info->n_directories));
 
@@ -199,7 +199,7 @@ check_display_name_list (CacheInfo *info,
                          guint32    offset)
 {
   guint32 n_display_names, ofs;
-  gint i;
+  int i;
 
   check ("offset, display name list",
          get_uint32 (info, offset, &n_display_names));
@@ -306,7 +306,7 @@ check_image_list (CacheInfo *info,
                   guint32    offset)
 {
   guint32 n_images;
-  gint i;
+  int i;
 
   check ("offset, image list", get_uint32 (info, offset, &n_images));
 
@@ -350,7 +350,7 @@ check_hash (CacheInfo *info,
             guint32    offset)
 {
   guint32 n_buckets, icon_offset;
-  gint i;
+  int i;
 
   check ("offset, hash size", get_uint32 (info, offset, &n_buckets));
 
index 507c790b41738bc959c9bebeba630e5531074f63..b6b5912e4766c86056cd0d4eed58c07aaf641d61 100644 (file)
@@ -87,7 +87,7 @@ static gboolean
 is_cache_up_to_date (const gchar *path)
 {
   gchar *cache_path;
-  gint retval;
+  int retval;
 
   cache_path = g_build_filename (path, CACHE_NAME, NULL);
   retval = g_stat (cache_path, &cache_dir_stat);
@@ -176,7 +176,7 @@ typedef struct
   char **display_names;
 
   guint32 offset;
-  gint size;
+  int size;
 } IconData;
 
 static GHashTable *image_data_hash = NULL;
@@ -234,7 +234,7 @@ load_icon_data (const char *path)
   char *str;
   char *split_point;
   int i;
-  gint *ivalues;
+  int *ivalues;
   GError *error = NULL;
   gchar **keys;
   gsize n_keys;
@@ -591,7 +591,7 @@ scan_directory (const gchar *base_path,
                const gchar *subdir,
                GHashTable  *files,
                GList       *directories,
-               gint         depth)
+               int          depth)
 {
   GHashTable *dir_hash;
   GDir *dir;
@@ -716,7 +716,7 @@ struct _HashNode
   HashNode *next;
   gchar *name;
   GList *image_list;
-  gint offset;
+  int offset;
 };
 
 static guint
@@ -733,7 +733,7 @@ icon_name_hash (gconstpointer key)
 }
 
 typedef struct {
-  gint size;
+  int size;
   HashNode **nodes;
 } HashContext;
 
@@ -822,7 +822,7 @@ write_image_data (FILE *cache, ImageData *image_data, int offset)
 {
   guint8 *s;
   guint len;
-  gint i;
+  int i;
   GdkPixdata *pixdata = &image_data->pixdata;
 
   /* Type 0 is GdkPixdata */
@@ -970,10 +970,10 @@ write_header (FILE *cache, guint32 dir_list_offset)
          write_card32 (cache, dir_list_offset));
 }
 
-static gint
+static int
 get_image_meta_data_size (Image *image)
 {
-  gint i;
+  int i;
 
   /* The complication with storing the size in both
    * IconData and Image is necessary since we attribute
@@ -1032,7 +1032,7 @@ get_image_meta_data_size (Image *image)
   return image->icon_data_size;
 }
 
-static gint
+static int
 get_image_pixel_data_size (Image *image)
 {
   /* The complication with storing the size in both
@@ -1057,10 +1057,10 @@ get_image_pixel_data_size (Image *image)
   return image->pixel_data_size;
 }
 
-static gint
+static int
 get_image_data_size (Image *image)
 {
-  gint len;
+  int len;
 
   len = 0;
 
@@ -1625,7 +1625,7 @@ write_csource (const gchar *path)
   gchar *cache_path;
   gchar *data;
   gsize len;
-  gint i;
+  int i;
 
   cache_path = g_build_filename (path, CACHE_NAME, NULL);
   if (!g_file_get_contents (cache_path, &data, &len, NULL))
index ee65a18287161fb94f751639210e04da29aa2257..42f3d03900b12ca8c26aa74d8cc27a2f965e2e11 100644 (file)
@@ -282,7 +282,7 @@ gtk_cloudprint_account_got_oauth2_access_token_cb (GObject *source,
   RestProxyCall *call;
   RestProxy *rest;
   GVariant *output;
-  gint   expires_in = 0;
+  int    expires_in = 0;
   GError *error = NULL;
 
   output = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
@@ -350,7 +350,7 @@ gtk_cloudprint_account_ensure_credentials_cb (GObject *source,
   GTask *task = user_data;
   GtkCloudprintAccount *account = g_task_get_task_data (task);
   GVariant *output;
-  gint expires_in = 0;
+  int expires_in = 0;
   GError *error = NULL;
 
   output = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source),
index 4a9b447bd99f24ba88a448cd60f480d8e9f257cf..ab3a94b9648279daeb650b74d3db091995c11234 100644 (file)
@@ -110,7 +110,7 @@ get_secret_cb (GObject      *source_object,
                      *value = NULL;
   GVariantIter       *iter = NULL;
   guint               i, required_len;
-  gint                pw_field = -1;
+  int                 pw_field = -1;
 
   task = user_data;
   task_data = g_task_get_task_data (task);
@@ -899,7 +899,7 @@ gtk_cups_secrets_service_watch (GBusNameAppearedCallback appeared,
 static void
 cleanup_task_data (gpointer data)
 {
-  gint                i;
+  int                 i;
   SecretsServiceData *task_data = data;
 
   g_free (task_data->collection_path);
index f5a7f8dd59d4ab5f213852cd7f84b7279c6b0e56..3387cce99d336925792833e3f9e6feb4717b08fc 100644 (file)
@@ -105,7 +105,7 @@ gtk_cups_result_set_error (GtkCupsResult    *result,
 GtkCupsRequest *
 gtk_cups_request_new_with_username (http_t             *connection,
                                     GtkCupsRequestType  req_type, 
-                                    gint                operation_id,
+                                    int                 operation_id,
                                     GIOChannel         *data_io,
                                     const char         *server,
                                     const char         *resource,
@@ -197,7 +197,7 @@ gtk_cups_request_new_with_username (http_t             *connection,
 GtkCupsRequest *
 gtk_cups_request_new (http_t             *connection,
                       GtkCupsRequestType  req_type, 
-                      gint                operation_id,
+                      int                 operation_id,
                       GIOChannel         *data_io,
                       const char         *server,
                       const char         *resource)
@@ -650,8 +650,8 @@ gtk_cups_request_encode_option (GtkCupsRequest *request,
                                
 void
 gtk_cups_request_set_ipp_version (GtkCupsRequest     *request,
-                                 gint                major,
-                                 gint                minor)
+                                 int                 major,
+                                 int                 minor)
 {
   ippSetVersion (request->ipp_request, major, minor);
 }
@@ -1537,9 +1537,9 @@ gtk_cups_connection_test_get_state (GtkCupsConnectionTest *test)
 {
   GtkCupsConnectionState result = GTK_CUPS_CONNECTION_NOT_AVAILABLE;
   http_addrlist_t       *iter;
-  gint                   error_code;
-  gint                   flags;
-  gint                   code;
+  int                    error_code;
+  int                    flags;
+  int                    code;
 
   if (test == NULL)
     return GTK_CUPS_CONNECTION_NOT_AVAILABLE;
index 500bb4fecfd9d733bcefcfaabe89d985bf372992..84303f51632a890144812b905c55064ea2df8d50 100644 (file)
@@ -85,20 +85,20 @@ struct _GtkCupsRequest
   gchar *server;
   gchar *resource;
   GIOChannel *data_io;
-  gint attempts;
+  int attempts;
 
   GtkCupsResult *result;
 
-  gint state;
+  int state;
   GtkCupsPollState poll_state;
   guint64 bytes_received;
 
   gchar *password;
   gchar *username;
 
-  gint own_http : 1;
-  gint need_password : 1;
-  gint need_auth_info : 1;
+  int own_http : 1;
+  int need_password : 1;
+  int need_auth_info : 1;
   gchar **auth_info_required;
   gchar **auth_info;
   GtkCupsPasswordState password_state;
@@ -110,7 +110,7 @@ struct _GtkCupsConnectionTest
   http_addrlist_t       *addrlist;
   http_addrlist_t       *current_addr;
   http_addrlist_t       *last_wrong_addr;
-  gint                   socket;
+  int                    socket;
 };
 
 #define GTK_CUPS_REQUEST_START 0
@@ -142,14 +142,14 @@ enum
 
 GtkCupsRequest        * gtk_cups_request_new_with_username (http_t             *connection,
                                                            GtkCupsRequestType  req_type,
-                                                           gint                operation_id,
+                                                           int                 operation_id,
                                                            GIOChannel         *data_io,
                                                            const char         *server,
                                                            const char         *resource,
                                                            const char         *username);
 GtkCupsRequest        * gtk_cups_request_new               (http_t             *connection,
                                                            GtkCupsRequestType  req_type,
-                                                           gint                operation_id,
+                                                           int                 operation_id,
                                                            GIOChannel         *data_io,
                                                            const char         *server,
                                                            const char         *resource);
@@ -179,8 +179,8 @@ void                    gtk_cups_request_encode_option     (GtkCupsRequest     *
                                                            const gchar        *option,
                                                            const gchar        *value);
 void                    gtk_cups_request_set_ipp_version   (GtkCupsRequest     *request,
-                                                           gint                major,
-                                                           gint                minor);
+                                                           int                 major,
+                                                           int                 minor);
 gboolean                gtk_cups_result_is_error           (GtkCupsResult      *result);
 ipp_t                 * gtk_cups_result_get_response       (GtkCupsResult      *result);
 GtkCupsErrorType        gtk_cups_result_get_error_type     (GtkCupsResult      *result);
index 6a5d7755afb32743ea682a4ea7270c0dc1ca631b..8c6a1c29b736268655c0e3a9609422af801ca276 100644 (file)
@@ -260,8 +260,8 @@ typedef struct {
   gchar *path;
 
   /* Base64 encoding state */
-  gint b64state;
-  gint b64save;
+  int b64state;
+  int b64save;
 } _PrintStreamData;
 
 static void
@@ -551,7 +551,7 @@ get_accounts (GVariant *output)
 {
   GVariant *objects;
   GList    *result = NULL;
-  gint      i, j, k;
+  int       i, j, k;
 
   g_variant_get (output, "(@a{oa{sa{sv}}})",
                  &objects);
@@ -950,7 +950,7 @@ cloudprint_printer_prepare_for_print (GtkPrinter       *printer,
   if (gtk_print_job_get_pages (print_job) == GTK_PRINT_PAGES_RANGES)
     {
       GtkPageRange *page_ranges;
-      gint num_page_ranges;
+      int num_page_ranges;
       page_ranges = gtk_print_settings_get_page_ranges (settings, &num_page_ranges);
       gtk_print_job_set_page_ranges (print_job, page_ranges, num_page_ranges);
     }
index d91a9ec577d576456a81a6545037a2220e5f01af..bd972b966cfe7a1fe98f7c16d8cbbd4b9cd836a3 100644 (file)
@@ -128,11 +128,11 @@ struct _GtkPrintBackendCups
 
   guint list_printers_poll;
   guint list_printers_pending : 1;
-  gint  list_printers_attempts;
+  int   list_printers_attempts;
   guint got_default_printer   : 1;
   guint default_printer_poll;
   GtkCupsConnectionTest *cups_connection_test;
-  gint  reading_ppds;
+  int   reading_ppds;
 
   GList      *requests;
   GHashTable *auth;
@@ -392,7 +392,7 @@ cups_printer_create_cairo_surface (GtkPrinter       *printer,
   ppd_attr_t      *ppd_attr_screen_freq = NULL;
   ppd_attr_t      *ppd_attr_res_screen_freq = NULL;
   gchar           *res_string = NULL;
-  gint             level = 2;
+  int              level = 2;
 
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
@@ -557,7 +557,7 @@ add_cups_options (const gchar *key,
   GtkPrinterCups *printer = data->printer;
   gboolean custom_value = FALSE;
   gchar *new_value = NULL;
-  gint i;
+  int i;
 
   if (!key || !value)
     return;
@@ -1008,8 +1008,8 @@ gtk_print_backend_cups_set_password (GtkPrintBackend  *backend,
   gchar *username = NULL;
   gchar *hostname = NULL;
   gchar *password = NULL;
-  gint   length;
-  gint   i;
+  int    length;
+  int    i;
 
   length = g_strv_length (auth_info_required);
 
@@ -1091,8 +1091,8 @@ request_password (gpointer data)
   gchar                    **auth_info_default;
   gchar                    **auth_info_display;
   gboolean                  *auth_info_visible;
-  gint                       length = 3;
-  gint                       i;
+  int                        length = 3;
+  int                        i;
 
   if (dispatch->backend->authentication_lock)
     return G_SOURCE_REMOVE;
@@ -1268,8 +1268,8 @@ check_auth_info (gpointer user_data)
         }
       else
         {
-          gint length;
-          gint i;
+          int length;
+          int i;
 
           length = g_strv_length (dispatch->request->auth_info_required);
 
@@ -1305,7 +1305,7 @@ lookup_auth_info_cb (GObject      *source_object,
   GtkPrintCupsDispatchWatch  *dispatch;
   gchar                     **auth_info;
   GError                     *error = NULL;
-  gint                        i;
+  int                         i;
 
   task = (GTask *) res;
   dispatch = user_data;
@@ -1396,8 +1396,8 @@ request_auth_info (gpointer user_data)
   const char                 *printer_uri;
   gchar                      *prompt = NULL;
   char                       *printer_name = NULL;
-  gint                        length;
-  gint                        i;
+  int                         length;
+  int                         i;
   gboolean                   *auth_info_visible = NULL;
   gchar                     **auth_info_default = NULL;
   gchar                     **auth_info_display = NULL;
@@ -1519,7 +1519,7 @@ cups_dispatch_watch_check (GSource *source)
 
 static gboolean
 cups_dispatch_watch_prepare (GSource *source,
-                            gint    *timeout_)
+                            int     *timeout_)
 {
   GtkPrintCupsDispatchWatch *dispatch;
   gboolean result;
@@ -1820,7 +1820,7 @@ cups_job_info_poll_timeout (gpointer user_data)
 static void
 cups_begin_polling_info (GtkPrintBackendCups *print_backend,
                         GtkPrintJob         *job,
-                        gint                 job_id)
+                        int                  job_id)
 {
   CupsJobPollData *data;
 
@@ -1844,7 +1844,7 @@ mark_printer_inactive (GtkPrinter      *printer,
   g_signal_emit_by_name (backend, "printer-removed", printer);
 }
 
-static gint
+static int
 find_printer (GtkPrinter  *printer,
              const gchar *find_name)
 {
@@ -1956,8 +1956,8 @@ typedef struct
   gchar *state_msg;
   const gchar *reason_msg;
   PrinterStateLevel reason_level;
-  gint state;
-  gint job_count;
+  int state;
+  int job_count;
   gboolean is_paused;
   gboolean is_accepting_jobs;
   const gchar *default_cover_before;
@@ -1968,7 +1968,7 @@ typedef struct
   gboolean avahi_printer;
   gchar   *avahi_resource_path;
   gchar  **auth_info_required;
-  gint     default_number_up;
+  int      default_number_up;
   guchar   ipp_version_major;
   guchar   ipp_version_minor;
   gboolean supports_copies;
@@ -2047,7 +2047,7 @@ get_server_ipp_version (guchar *ipp_version_major,
     }
 }
 
-static gint
+static int
 ipp_version_cmp (guchar ipp_version_major1,
                  guchar ipp_version_minor1,
                  guchar ipp_version_major2,
@@ -2075,7 +2075,7 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
                               ipp_attribute_t *attr,
                               PrinterSetupInfo *info)
 {
-  gint i, j;
+  int i, j;
   if (strcmp (ippGetName (attr), "printer-name") == 0 &&
       ippGetValueTag (attr) == IPP_TAG_NAME)
     info->printer_name = ippGetString (attr, 0, NULL);
@@ -2272,7 +2272,7 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
     {
       ipp_attribute_t *iter;
       ipp_t           *col;
-      gint             num_of_margins = 0;
+      int              num_of_margins = 0;
 
       for (i = 0; i < ippGetCount (attr); i++)
         {
@@ -2590,7 +2590,7 @@ get_reason_msg_desc (guint i,
 static void
 set_info_state_message (PrinterSetupInfo *info)
 {
-  gint i;
+  int i;
 
   if (info->state_msg == NULL || strlen (info->state_msg) == 0)
     {
@@ -2843,7 +2843,7 @@ typedef struct
   gchar               *printer_uri;
   gchar               *location;
   gchar               *host;
-  gint                 port;
+  int                  port;
   gchar               *printer_name;
   gchar               *name;
   gchar               *resource_path;
@@ -3085,10 +3085,10 @@ avahi_service_resolver_cb (GObject      *source_object,
   gchar                   *key;
   gchar                   *value;
   gsize                    length;
-  gint                     interface;
-  gint                     protocol;
-  gint                     aprotocol;
-  gint                     i, j;
+  int                      interface;
+  int                      protocol;
+  int                      aprotocol;
+  int                      i, j;
 
   output = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
                                           res,
@@ -3260,8 +3260,8 @@ avahi_service_browser_signal_handler (GDBusConnection *connection,
   gchar               *type;
   gchar               *domain;
   guint                flags;
-  gint                 interface;
-  gint                 protocol;
+  int                  interface;
+  int                  protocol;
 
   if (g_strcmp0 (signal_name, "ItemNew") == 0)
     {
@@ -3347,7 +3347,7 @@ avahi_service_browser_new_cb (GObject      *source_object,
   GtkPrintBackendCups *cups_backend;
   GVariant            *output;
   GError              *error = NULL;
-  gint                 i;
+  int                  i;
 
   output = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source_object),
                                           res,
@@ -3895,7 +3895,7 @@ cups_request_ppd (GtkPrinter *printer)
   GetPPDData *data;
   int fd;
   const gchar *hostname;
-  gint port;
+  int port;
 
   cups_printer = GTK_PRINTER_CUPS (printer);
 
@@ -4507,7 +4507,7 @@ static const struct {
  * https://mail.gnome.org/archives/desktop-devel-list/2016-March/msg00075.html
  */
 static gchar *
-get_ipp_choice_translation_string (gint  index,
+get_ipp_choice_translation_string (int   index,
                                   guint i)
 {
   gchar *translation;
@@ -5122,7 +5122,7 @@ strptr_cmp (const void *a,
 static gboolean
 string_in_table (const gchar *str,
                 const gchar *table[],
-                gint         table_len)
+                int          table_len)
 {
   return bsearch (&str, table, table_len, sizeof (char *), (void *)strptr_cmp) != NULL;
 }
@@ -5207,7 +5207,7 @@ handle_group (GtkPrinterOptionSet *set,
              ppd_group_t         *toplevel_group,
              GtkPrintSettings    *settings)
 {
-  gint i;
+  int i;
   const gchar *name;
 
   /* Ignore installable options */
@@ -5248,7 +5248,7 @@ get_ipp_option_translation (const gchar  *ipp_option_name,
                             gchar       **gtk_option_name,
                             gchar       **translation)
 {
-  gint i;
+  int i;
 
   *gtk_option_name = NULL;
   *translation = NULL;
@@ -5280,7 +5280,7 @@ get_ipp_choice_translation (const gchar  *ipp_option_name,
   gchar       *translation = NULL;
   gsize        ipp_choice_length;
   gchar       *endptr;
-  gint         i;
+  int          i;
 
   for (i = 0; ipp_choice_translations[i].ipp_option_name != NULL; i++)
     {
@@ -5529,9 +5529,9 @@ cups_printer_get_options (GtkPrinter           *printer,
       char **cover = NULL;
       char **cover_display = NULL;
       char **cover_display_translated = NULL;
-      gint num_of_covers = 0;
+      int num_of_covers = 0;
       gconstpointer value;
-      gint j;
+      int j;
 
        /* Translators, this string is used to label the pages-per-sheet option
         * in the print dialog
@@ -5732,7 +5732,7 @@ cups_printer_get_options (GtkPrinter           *printer,
       if (strcmp (name, "cups-job-sheets") == 0)
         {
           gchar **values;
-          gint    num_values;
+          int     num_values;
 
           values = g_strsplit (opts[i].value, ",", 2);
           num_values = g_strv_length (values);
@@ -5953,7 +5953,7 @@ typedef struct {
 static void
 map_settings_to_option (GtkPrinterOption  *option,
                        const NameMapping  table[],
-                       gint               n_elements,
+                       int                n_elements,
                        GtkPrintSettings  *settings,
                        const gchar       *standard_name,
                        const gchar       *cups_name,
@@ -6016,7 +6016,7 @@ map_settings_to_option (GtkPrinterOption  *option,
 static void
 map_option_to_settings (const gchar       *value,
                        const NameMapping  table[],
-                       gint               n_elements,
+                       int                n_elements,
                        GtkPrintSettings  *settings,
                        const gchar       *standard_name,
                        const gchar       *cups_name,
@@ -6436,7 +6436,7 @@ cups_printer_prepare_for_print (GtkPrinter       *printer,
 {
   GtkPrintPages pages;
   GtkPageRange *ranges;
-  gint n_ranges;
+  int n_ranges;
   GtkPageSet page_set;
   GtkPaperSize *paper_size;
   const char *ppd_paper_name;
@@ -6615,10 +6615,10 @@ static GtkPageSetup *
 create_page_setup_from_media (gchar     *media,
                               MediaSize *media_size,
                               gboolean   media_margin_default_set,
-                              gint       media_bottom_margin_default,
-                              gint       media_top_margin_default,
-                              gint       media_left_margin_default,
-                              gint       media_right_margin_default)
+                              int        media_bottom_margin_default,
+                              int        media_top_margin_default,
+                              int        media_left_margin_default,
+                              int        media_right_margin_default)
 {
   GtkPageSetup *page_setup;
   GtkPaperSize *paper_size;
index 071ebec3597de726b33bac78392b5b27edddb0e1..79100603bc7769008a097430daf72073b90cb25d 100644 (file)
@@ -172,7 +172,7 @@ static OutputFormat
 format_from_settings (GtkPrintSettings *settings)
 {
   const gchar *value;
-  gint i;
+  int i;
 
   if (settings == NULL)
     return N_FORMATS;
@@ -535,7 +535,7 @@ set_printer_format_from_option_set (GtkPrinter          *printer,
 {
   GtkPrinterOption *format_option;
   const gchar *value;
-  gint i;
+  int i;
 
   format_option = gtk_printer_option_set_lookup (set, "output-file-format");
   if (format_option && format_option->value)
@@ -590,7 +590,7 @@ file_printer_output_file_format_changed (GtkPrinterOption    *format_option,
 
       if (dot)
         {
-          gint i;
+          int i;
 
           /*  check if the file extension matches one of the known ones  */
           for (i = 0; i < N_FORMATS; i++)
@@ -637,10 +637,10 @@ file_printer_get_options (GtkPrinter           *printer,
   const char *format_names[N_FORMATS] = { N_("PDF"), N_("PostScript"), N_("SVG") };
   const char *supported_formats[N_FORMATS];
   const char *display_format_names[N_FORMATS];
-  gint n_formats = 0;
+  int n_formats = 0;
   OutputFormat format;
   char *uri;
-  gint current_format = 0;
+  int current_format = 0;
   _OutputFormatChangedData *format_changed_data;
 
   format = format_from_settings (settings);
@@ -773,7 +773,7 @@ file_printer_prepare_for_print (GtkPrinter       *printer,
   gdouble scale;
   GtkPrintPages pages;
   GtkPageRange *ranges;
-  gint n_ranges;
+  int n_ranges;
   OutputFormat format;
 
   pages = gtk_print_settings_get_print_pages (settings);
index 9635c3095e22b8d5576f0071b7d76aaaf853ac1d..b78cc6b2e672d40d6df1134089407a0348cd02c0 100644 (file)
@@ -303,8 +303,8 @@ gtk_print_backend_lpr_print_stream (GtkPrintBackend        *print_backend,
   GError *print_error = NULL;
   _PrintStreamData *ps;
   GtkPrintSettings *settings;
-  gint argc;
-  gint in_fd;
+  int argc;
+  int in_fd;
   gchar **argv = NULL;
   const char *cmd_line;
 
@@ -448,7 +448,7 @@ lpr_printer_prepare_for_print (GtkPrinter       *printer,
   double scale;
   GtkPrintPages pages;
   GtkPageRange *ranges;
-  gint n_ranges;
+  int n_ranges;
 
   pages = gtk_print_settings_get_print_pages (settings);
   gtk_print_job_set_pages (print_job, pages);
index 02a440b4e5c8a0587587ce6b192e71a56fa17ba8..af759b0235db06ee0caa000d1ecca8058ac0ebbc 100644 (file)
@@ -51,11 +51,11 @@ struct _GtkPrinterCups
   gchar *original_device_uri;
   gchar *printer_uri;
   gchar *hostname;
-  gint port;
+  int port;
   gchar **auth_info_required;
   gchar *original_hostname;
   gchar *original_resource;
-  gint original_port;
+  int original_port;
   gboolean request_original_uri; /* Request PPD from original host */
 
   ipp_pstate_t state;
@@ -66,10 +66,10 @@ struct _GtkPrinterCups
   gchar    *media_default;
   GList    *media_supported;
   GList    *media_size_supported;
-  gint      media_bottom_margin_default;
-  gint      media_top_margin_default;
-  gint      media_left_margin_default;
-  gint      media_right_margin_default;
+  int       media_bottom_margin_default;
+  int       media_top_margin_default;
+  int       media_left_margin_default;
+  int       media_right_margin_default;
   gboolean  media_margin_default_set;
   gchar    *sides_default;
   GList    *sides_supported;
@@ -79,11 +79,11 @@ struct _GtkPrinterCups
   gchar  *default_cover_before;
   gchar  *default_cover_after;
 
-  gint    default_number_up;
+  int     default_number_up;
 
   gboolean remote;
   guint get_remote_ppd_poll;
-  gint  get_remote_ppd_attempts;
+  int   get_remote_ppd_attempts;
   GtkCupsConnectionTest *remote_cups_connection_test;
 
 #ifdef HAVE_COLORD
index 09adaa601fede511866201e2bbf923c76f31c916..8c3320842b93b265be46de3ebb0ad9b779ec0a4d 100644 (file)
@@ -14,7 +14,7 @@ typedef struct
   GObject parent;
 
   gchar *label;
-  gint id;
+  int id;
 } MyObject;
 
 typedef struct
@@ -115,10 +115,10 @@ create_widget (gpointer item,
   return label;
 }
 
-static gint
+static int
 compare_items (gconstpointer a, gconstpointer b, gpointer data)
 {
-  gint id_a, id_b;
+  int id_a, id_b;
 
   g_object_get ((gpointer)a, "id", &id_a, NULL);
   g_object_get ((gpointer)b, "id", &id_b, NULL);
@@ -129,7 +129,7 @@ compare_items (gconstpointer a, gconstpointer b, gpointer data)
 static void
 add_some (GtkButton *button, GListStore *store)
 {
-  gint n, i;
+  int n, i;
   guint n_items;
   GObject *obj;
   gchar *label;
@@ -152,7 +152,7 @@ add_some (GtkButton *button, GListStore *store)
 static void
 remove_some (GtkButton *button, GListStore *store)
 {
-  gint n, i;
+  int n, i;
   guint n_items;
 
   for (n = 0; n < 50; n++)
@@ -170,7 +170,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window, *grid, *sw, *box, *button;
   GListStore *store;
-  gint i;
+  int i;
 
   gtk_init ();
 
index 9a447b5c6328203db7e219da69fde6571d87460e..c3b595bb747b6a3c7eb2d5370ac1547e3972174f 100644 (file)
@@ -22,7 +22,7 @@ static gchar *
 get_content (void)
 {
   GString *s;
-  gint i;
+  int i;
 
   s = g_string_new ("");
   for (i = 1; i <= 150; i++)
@@ -34,7 +34,7 @@ get_content (void)
 static void
 mode_changed (GtkComboBox *combo, GtkScrolledWindow *sw)
 {
-  gint active = gtk_combo_box_get_active (combo);
+  int active = gtk_combo_box_get_active (combo);
 
   gtk_scrolled_window_set_overlay_scrolling (sw, active == 1);
 }
index 05338c760734cadcc6c8880c0df33d5ff2e6efed..d42fc9b8f5d5007432e6eb7a976c68c0b20ff87e 100644 (file)
@@ -3,7 +3,7 @@
 static void
 fill_text_view (GtkWidget *tv, const gchar *text)
 {
-  gint i;
+  int i;
   GString *s;
 
   s = g_string_new ("");
index 9ff403507dc766c737f84fdf3bab9c2bbe884b6c..a74a081e4037fa9d330e8b207037a2aa90b33ccf 100644 (file)
@@ -35,7 +35,7 @@ accel_edited_callback (GtkCellRendererText *cell,
   g_print ("%u %d %u\n", keyval, mask, hardware_keycode);
   
   gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                      0, (gint)mask,
+                      0, (int)mask,
                       1, keyval,
                       2, hardware_keycode,
                       -1);
@@ -63,7 +63,7 @@ key_test (void)
   GtkListStore *store;
   GtkTreeViewColumn *column;
   GtkCellRenderer *rend;
-  gint i;
+  int i;
   GtkWidget *box, *entry;
 
   /* create window */
@@ -116,8 +116,8 @@ key_test (void)
   return window;
 }
 
-gint
-main (gint argc, gchar **argv)
+int
+main (int argc, gchar **argv)
 {
   GtkWidget *dialog;
   
index 63ec9bfdee05a93cb5ad9f5fdc3a47122538b859..f398694d0e2e92b8ed93b780ba482a0678f41e6c 100644 (file)
@@ -30,7 +30,7 @@ static GtkWidget *def, *recommended, *fallback, *other, *all;
 
 static void
 dialog_response (GtkDialog *d,
-                 gint       response_id,
+                 int        response_id,
                  gpointer   user_data)
 {
   GAppInfo *app_info;
index 22ee8209c2c3e34285d770ef0eaa83143a60c010..00b1674d522687f6170cb957de1f97f47f0b692d 100644 (file)
@@ -108,7 +108,7 @@ static gboolean
 progress_timeout (GtkWidget *assistant)
 {
   GtkWidget *progress;
-  gint current_page;
+  int current_page;
   gdouble value;
 
   current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (assistant));
@@ -323,8 +323,8 @@ select_branch (GtkWidget *widget, gchar branch)
   selected_branch = branch;
 }
 
-static gint
-nonlinear_assistant_forward_page (gint current_page, gpointer data)
+static int
+nonlinear_assistant_forward_page (int current_page, gpointer data)
 {
   switch (current_page)
     {
@@ -408,8 +408,8 @@ create_nonlinear_assistant (GtkWidget *widget)
     }
 }
 
-static gint
-looping_assistant_forward_page (gint current_page, gpointer data)
+static int
+looping_assistant_forward_page (int current_page, gpointer data)
 {
   switch (current_page)
     {
@@ -680,7 +680,7 @@ int
 main (int argc, gchar *argv[])
 {
   GtkWidget *window, *box, *button;
-  gint i;
+  int i;
   gboolean done = FALSE;
 
   gtk_init ();
index f229a9b6607c1d7f0d7e3ac621ea2e113f527f4b..d5fe7818763f6e94aede3f16501b029e861d25f6 100644 (file)
@@ -28,7 +28,7 @@ static void
 baseline_row_value_changed (GtkSpinButton *spin_button,
                            GtkGrid *grid)
 {
-  gint row = gtk_spin_button_get_value_as_int (spin_button);
+  int row = gtk_spin_button_get_value_as_int (spin_button);
 
   gtk_grid_set_baseline_row (grid, row);
 }
@@ -53,13 +53,13 @@ static void
 image_size_value_changed (GtkSpinButton *spin_button,
                          GtkImage *image)
 {
-  gint size = gtk_spin_button_get_value_as_int (spin_button);
+  int size = gtk_spin_button_get_value_as_int (spin_button);
 
   gtk_image_set_pixel_size (GTK_IMAGE (image), size);
 }
 
 static void
-set_font_size (GtkWidget *widget, gint size)
+set_font_size (GtkWidget *widget, int size)
 {
   const gchar *class[3] = { "small-font", "medium-font", "large-font" };
 
index de43eac502aa7a42b3e943a3585031cc479191a7..2610a86688cde77eaa54d6d2863c163e4cb5716b 100644 (file)
@@ -182,7 +182,7 @@ create_calendar(void)
   GtkWidget *calendar = gtk_calendar_new ();
   GtkWidget *button;
   GtkWidget *frame, *label, *bbox;
-  gint i;
+  int i;
   struct {
     const char *prop_name;
     const char *label;
index 158553c28bb1bdbc180cb064384356d78654199e..6c66daa98aafef053b937893296921d8e391f04a 100644 (file)
@@ -466,9 +466,9 @@ cell_spacing_changed (GtkSpinButton    *spin_button,
                      GtkIconView *iconview)
 {
   GtkCellArea *area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (iconview));
-  gint        value;
+  int         value;
 
-  value = (gint)gtk_spin_button_get_value (spin_button);
+  value = (int)gtk_spin_button_get_value (spin_button);
 
   gtk_cell_area_box_set_spacing (GTK_CELL_AREA_BOX (area), value);
 }
@@ -477,9 +477,9 @@ static void
 row_spacing_changed (GtkSpinButton    *spin_button,
                     GtkIconView *iconview)
 {
-  gint value;
+  int value;
 
-  value = (gint)gtk_spin_button_get_value (spin_button);
+  value = (int)gtk_spin_button_get_value (spin_button);
 
   gtk_icon_view_set_row_spacing (iconview, value);
 }
@@ -488,9 +488,9 @@ static void
 item_padding_changed (GtkSpinButton    *spin_button,
                     GtkIconView *iconview)
 {
-  gint value;
+  int value;
 
-  value = (gint)gtk_spin_button_get_value (spin_button);
+  value = (int)gtk_spin_button_get_value (spin_button);
 
   gtk_icon_view_set_item_padding (iconview, value);
 }
index fc1a53bedc2c8bda57a541f22edee8d126100a14..fd1099c3df656fe7b12debb6e34882fab0c5f125 100644 (file)
@@ -736,7 +736,7 @@ capital_sensitive (GtkCellLayout   *cell_layout,
 static gboolean
 capital_animation (gpointer data)
 {
-  static gint insert_count = 0;
+  static int insert_count = 0;
   GtkTreeModel *model = GTK_TREE_MODEL (data);
   GtkTreePath *path;
   GtkTreeIter iter, parent;
@@ -879,7 +879,7 @@ set_sensitive (GtkCellLayout   *cell_layout,
               gpointer         data)
 {
   GtkTreePath *path;
-  gint *indices;
+  int *indices;
   gboolean sensitive;
 
   path = gtk_tree_model_get_path (tree_model, iter);
@@ -910,7 +910,7 @@ static void
 displayed_row_changed (GtkComboBox *combo,
                        GtkCellView *cell)
 {
-  gint row;
+  int row;
   GtkTreePath *path;
 
   row = gtk_combo_box_get_active (combo);
@@ -942,7 +942,7 @@ main (int argc, char **argv)
        GtkTreeIter iter;
        GtkCellArea *area;
         gchar *text;
-        gint i;
+        int i;
         gboolean done = FALSE;
 
         gtk_init ();
index a72a44ad46bfe0c0d22204a1e4e21307e461545d..ba06bf88da2ccf7c2a375d6e73114cf3f1883b1a 100644 (file)
@@ -115,8 +115,8 @@ static void
 on_reorder (void)
 {
   GArray *new_contents;
-  gint *shuffle_array;
-  gint i;
+  int *shuffle_array;
+  int i;
 
   shuffle_array = g_new (int, contents->len);
   
@@ -125,8 +125,8 @@ on_reorder (void)
 
   for (i = 0; i + 1 < contents->len; i++)
     {
-      gint pos = g_random_int_range (i, contents->len);
-      gint tmp;
+      int pos = g_random_int_range (i, contents->len);
+      int tmp;
 
       tmp = shuffle_array[i];
       shuffle_array[i] = shuffle_array[pos];
@@ -150,7 +150,7 @@ on_reorder (void)
 static int n_animations = 0;
 static int timer = 0;
 
-static gint
+static int
 animation_timer (gpointer data)
 {
   switch (g_random_int_range (0, 3)) 
index 07090289db4742cd09a1dcbe0ad3a9cfd894b6cc..81ebd98f8e4e195d5ede4dd5d5d21d11a00dde8b 100644 (file)
@@ -29,7 +29,7 @@ combo_changed_cb (GtkWidget *combo,
                  gpointer   data)
 {
   GtkWidget *label = GTK_WIDGET (data);
-  gint active;
+  int active;
 
   active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
   gtk_label_set_ellipsize (GTK_LABEL (label), (PangoEllipsizeMode)active);
index 68985d7383a9edd280eb223f9729aba4c1132328..37473a6b794c0d9db84749c47970cd644dcdb0a4 100644 (file)
@@ -182,7 +182,7 @@ match_func (GtkEntryCompletion *completion,
   return ret;
 }
 
-static gint timer_count = 0;
+static int timer_count = 0;
 
 static const char *dynamic_completions[] = {
   "GNOME",
@@ -210,12 +210,12 @@ static const char *dynamic_completions[] = {
   "zombie"
 };
 
-static gint
+static int
 animation_timer (GtkEntryCompletion *completion)
 {
   GtkTreeIter iter;
-  gint n_completions = G_N_ELEMENTS (dynamic_completions);
-  gint n;
+  int n_completions = G_N_ELEMENTS (dynamic_completions);
+  int n;
   static GtkListStore *old_store = NULL;
   GtkListStore *store = GTK_LIST_STORE (gtk_entry_completion_get_model (completion));
 
index 9d8bf7fd1f557c5d8bd6a8ebb40cd0981433ed87..cc875a5ee92209ac43ff434e0f9cd84629024cc2 100644 (file)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 static void
-clear_pressed (GtkEntry *entry, gint icon, gpointer data)
+clear_pressed (GtkEntry *entry, int icon, gpointer data)
 {
    if (icon == GTK_ENTRY_ICON_SECONDARY)
      gtk_editable_set_text (GTK_EDITABLE (entry), "");
index 6b4180cea22e707c72e116ab9ee18f2d7784de10..6e92026160de6c76b9f57e52fc5e342f8f58c12e 100644 (file)
@@ -128,8 +128,8 @@ test_error_trapping (GdkDisplay *gdk_display)
   XSync (d, TRUE);
 }
 
-gint
-main (gint argc, gchar *argv[])
+int
+main (int argc, gchar *argv[])
 {
   GdkDisplay *gdk_display;
   GdkDisplay *extra_display;
index 6e8359a92a578123c2b23f1a99f27b3ec3927d73..4d3fb13bd7f633cafe5c76f27dc6f3b3f0334672 100644 (file)
@@ -63,7 +63,7 @@ print_selected (GtkFileChooser *chooser)
 
 static void
 response_cb (GtkDialog *dialog,
-            gint       response_id,
+            int        response_id,
              gpointer   data)
 {
   gboolean *done = data;
index 6fef5fa2f41e09df96eb615d5d3d3f8696ffa876..727e16708bb31cc6448fb807db4045f7d95bb1a7 100644 (file)
@@ -34,13 +34,13 @@ enum {
 #define N_ITEMS 1000
 
 static GtkFlowBox    *the_flowbox       = NULL;
-static gint           items_type       = SIMPLE_ITEMS;
+static int            items_type       = SIMPLE_ITEMS;
 
 static void
 populate_flowbox_simple (GtkFlowBox *flowbox)
 {
   GtkWidget *widget, *frame;
-  gint i;
+  int i;
 
   for (i = 0; i < N_ITEMS; i++)
     {
@@ -62,7 +62,7 @@ static void
 populate_flowbox_focus (GtkFlowBox *flowbox)
 {
   GtkWidget *widget, *frame, *box;
-  gint i;
+  int i;
   gboolean sensitive;
 
   for (i = 0; i < 200; i++)
@@ -110,7 +110,7 @@ static void
 populate_flowbox_buttons (GtkFlowBox *flowbox)
 {
   GtkWidget *widget;
-  gint i;
+  int i;
 
   for (i = 0; i < 50; i++)
     {
@@ -125,7 +125,7 @@ static void
 populate_flowbox_wrappy (GtkFlowBox *flowbox)
 {
   GtkWidget *widget, *frame;
-  gint i;
+  int i;
 
   const gchar *strings[] = {
     "These are", "some wrappy label", "texts", "of various", "lengths.",
@@ -156,7 +156,7 @@ static void
 populate_flowbox_images (GtkFlowBox *flowbox)
 {
   GtkWidget *widget, *image, *label;
-  gint i;
+  int i;
 
   for (i = 0; i < N_ITEMS; i++)
     {
@@ -242,7 +242,7 @@ static void
 line_length_changed (GtkSpinButton *spin,
                      GtkFlowBox *flowbox)
 {
-  gint length = gtk_spin_button_get_value_as_int (spin);
+  int length = gtk_spin_button_get_value_as_int (spin);
 
   gtk_flow_box_set_min_children_per_line (flowbox, length);
 }
@@ -251,7 +251,7 @@ static void
 max_line_length_changed (GtkSpinButton *spin,
                          GtkFlowBox *flowbox)
 {
-  gint length = gtk_spin_button_get_value_as_int (spin);
+  int length = gtk_spin_button_get_value_as_int (spin);
 
   gtk_flow_box_set_max_children_per_line (flowbox, length);
 }
@@ -261,7 +261,7 @@ spacing_changed (GtkSpinButton *button,
                  gpointer       data)
 {
   GtkOrientation orientation = GPOINTER_TO_INT (data);
-  gint           state = gtk_spin_button_get_value_as_int (button);
+  int            state = gtk_spin_button_get_value_as_int (button);
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
     gtk_flow_box_set_column_spacing (the_flowbox, state);
@@ -319,7 +319,7 @@ on_selected_children_changed (GtkFlowBox *self)
 static gboolean
 filter_func (GtkFlowBoxChild *child, gpointer user_data)
 {
-  gint index;
+  int index;
 
   index = gtk_flow_box_child_get_index (child);
 
@@ -338,7 +338,7 @@ filter_toggled (GtkToggleButton *button,
     gtk_flow_box_set_filter_func (flowbox, NULL, NULL, NULL);
 }
 
-static gint
+static int
 sort_func (GtkFlowBoxChild *a,
            GtkFlowBoxChild *b,
            gpointer         data)
index 318baeb5b9a7370d47bcf2aa70bbe92e8838c26f..7d3a88af0e622ced75c4331627e3c82f7e235fc6 100644 (file)
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
     {
       FcConfig *config;
       PangoFontMap *fontmap;
-      gint i;
+      int i;
 
       /* Create a custom font configuration by adding font files specified
        * on the commandline to the default config.
index 579518751dba75a0370338672bf14113fdc1dcd4..c4f96391399395cb0c8745866cb15424022ef492 100644 (file)
@@ -350,7 +350,7 @@ create_action_treeview (GActionGroup *group)
   GtkTreeViewColumn *column;
   GtkCellRenderer *cell;
   gchar **group_actions;
-  gint i;
+  int i;
 
   store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
   group_actions = g_action_group_list_actions (group);
index 97c52cb609f945a62ac252cdeb8d9fa3d1d16434..690b7eb94c7822bede711db753c81b3fc8071526 100644 (file)
@@ -258,7 +258,7 @@ scrolling (void)
   GtkWidget *viewport;
   GtkWidget *grid;
   GtkWidget *child;
-  gint i;
+  int i;
 
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Scrolling");
index acb14b7615218d154c3b756bd3a5d56c122d8821..674274908ec7d54945da78d44a9c8e0475755f99 100644 (file)
@@ -61,8 +61,8 @@ file_exists (const char *filename)
 
 static GtkWidget *
 build_option_menu (const char           *items[],
-                  gint             num_items,
-                  gint             history,
+                  int              num_items,
+                  int              history,
                   void           (*func) (GtkWidget *widget, gpointer data),
                   gpointer         data);
 
@@ -92,13 +92,13 @@ typedef struct sTreeButtons {
 
 static GtkWidget *
 build_option_menu (const char           *items[],
-                  gint             num_items,
-                  gint             history,
+                  int              num_items,
+                  int              history,
                   void           (*func)(GtkWidget *widget, gpointer data),
                   gpointer         data)
 {
   GtkWidget *omenu;
-  gint i;
+  int i;
 
   omenu = gtk_combo_box_text_new ();
   g_signal_connect (omenu, "changed",
@@ -395,7 +395,7 @@ create_widget_grid (GType widget_type)
 {
   GtkWidget *grid;
   GtkWidget *group_widget = NULL;
-  gint i, j;
+  int i, j;
   
   grid = gtk_grid_new ();
   
@@ -865,7 +865,7 @@ create_selectable_control (GtkWidget *widget)
 }
 
 static void
-dialog_response (GtkWidget *dialog, gint response_id, GtkLabel *label)
+dialog_response (GtkWidget *dialog, int response_id, GtkLabel *label)
 {
   const gchar *text;
 
@@ -1421,8 +1421,8 @@ create_image (GtkWidget *widget)
 static int
 list_sort_cb (GtkListBoxRow *a, GtkListBoxRow *b, gpointer data)
 {
-  gint aa = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a), "value"));
-  gint bb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "value"));
+  int aa = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (a), "value"));
+  int bb = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (b), "value"));
   return aa - bb;
 }
 
@@ -1435,7 +1435,7 @@ list_filter_all_cb (GtkListBoxRow *row, gpointer data)
 static gboolean
 list_filter_odd_cb (GtkListBoxRow *row, gpointer data)
 {
-  gint value = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "value"));
+  int value = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "value"));
 
   return value % 2 == 0;
 }
@@ -1536,7 +1536,7 @@ create_listbox (GtkWidget *widget)
 
       for (i = 0; i < 1000; i++)
         {
-          gint value = g_random_int_range (0, 10000);
+          int value = g_random_int_range (0, 10000);
           label = gtk_label_new (g_strdup_printf ("Value %u", value));
           gtk_list_box_insert (GTK_LIST_BOX (list), label, -1);
           g_object_set_data (G_OBJECT (gtk_widget_get_parent (label)), "value", GINT_TO_POINTER (value));
@@ -1877,7 +1877,7 @@ scrolled_windows_destroy_cb (GtkWidget *widget, GtkWidget *scrollwin)
 }
 
 static void
-scrolled_windows_remove (GtkWidget *dialog, gint response, GtkWidget *scrollwin)
+scrolled_windows_remove (GtkWidget *dialog, int response, GtkWidget *scrollwin)
 {
   if (response != GTK_RESPONSE_APPLY)
     {
@@ -2458,7 +2458,7 @@ get_spin_value (GtkWidget *widget, gpointer data)
   g_free (buffer);
 }
 
-static gint
+static int
 spin_button_time_output_func (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
@@ -2475,11 +2475,11 @@ spin_button_time_output_func (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-static gint
+static int
 spin_button_month_input_func (GtkSpinButton *spin_button,
                              gdouble       *new_val)
 {
-  gint i;
+  int i;
   static const char *month[12] = { "January", "February", "March", "April",
                              "May", "June", "July", "August",
                              "September", "October", "November", "December" };
@@ -2506,12 +2506,12 @@ spin_button_month_input_func (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-static gint
+static int
 spin_button_month_output_func (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gdouble value;
-  gint i;
+  int i;
   static const char *month[12] = { "January", "February", "March", "April",
                              "May", "June", "July", "August", "September",
                              "October", "November", "December" };
@@ -2527,7 +2527,7 @@ spin_button_month_output_func (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-static gint
+static int
 spin_button_hex_input_func (GtkSpinButton *spin_button,
                            gdouble       *new_val)
 {
@@ -2544,7 +2544,7 @@ spin_button_hex_input_func (GtkSpinButton *spin_button,
     return TRUE;
 }
 
-static gint
+static int
 spin_button_hex_output_func (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
@@ -2556,7 +2556,7 @@ spin_button_hex_output_func (GtkSpinButton *spin_button)
   if (fabs (val) < 1e-5)
     sprintf (buf, "0x00");
   else
-    sprintf (buf, "0x%.2X", (gint) val);
+    sprintf (buf, "0x%.2X", (int) val);
   if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button))))
     gtk_editable_set_text (GTK_EDITABLE (spin_button), buf);
 
@@ -2854,7 +2854,7 @@ static GtkTreeModel *
 cursor_model (void)
 {
   GtkListStore *store;
-  gint i;
+  int i;
   store = gtk_list_store_new (1, G_TYPE_STRING);
 
   for (i = 0; i < G_N_ELEMENTS (cursor_names); i++)
@@ -2872,8 +2872,8 @@ cursor_pressed_cb (GtkGesture *gesture,
 {
   GtkWidget *widget;
   const gchar *name;
-  gint i;
-  const gint n = G_N_ELEMENTS (cursor_names);
+  int i;
+  const int n = G_N_ELEMENTS (cursor_names);
   int button;
 
   widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
@@ -2922,7 +2922,7 @@ change_cursor_theme (GtkWidget *widget,
 {
 #if defined(GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WAYLAND)
   const gchar *theme;
-  gint size;
+  int size;
   GdkDisplay *display;
   GtkWidget *entry;
   GtkWidget *spin;
@@ -2931,7 +2931,7 @@ change_cursor_theme (GtkWidget *widget,
   spin = gtk_widget_get_next_sibling (entry);
 
   theme = gtk_editable_get_text (GTK_EDITABLE (entry));
-  size = (gint) gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
+  size = (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
 
   display = gtk_widget_get_display (widget);
 #ifdef GDK_WINDOWING_X11
@@ -3310,7 +3310,7 @@ create_font_selection (GtkWidget *widget)
 static GtkWidget *dialog_window = NULL;
 
 static void
-dialog_response_cb (GtkWidget *widget, gint response, gpointer unused)
+dialog_response_cb (GtkWidget *widget, int response, gpointer unused)
 {
   GtkWidget *content_area;
   GtkWidget *child;
@@ -3421,7 +3421,7 @@ screen_display_check (GtkWidget *widget, ScreenDisplaySelection *data)
   else
     {
       GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (data->combo));
-      gint i = 0;
+      int i = 0;
       GtkTreeIter iter;
       gboolean found = FALSE;
       while (gtk_tree_model_iter_nth_child (model, &iter, NULL, i++))
@@ -3676,7 +3676,7 @@ GdkPixbuf *book_closed;
 GtkWidget *sample_notebook;
 
 static void
-set_page_image (GtkNotebook *notebook, gint page_num, GdkPixbuf *pixbuf)
+set_page_image (GtkNotebook *notebook, int page_num, GdkPixbuf *pixbuf)
 {
   GtkWidget *page_widget;
   GtkWidget *pixwid;
@@ -3691,10 +3691,10 @@ set_page_image (GtkNotebook *notebook, gint page_num, GdkPixbuf *pixbuf)
 }
 
 static void
-page_switch (GtkWidget *widget, gpointer *page, gint page_num)
+page_switch (GtkWidget *widget, gpointer *page, int page_num)
 {
   GtkNotebook *notebook = GTK_NOTEBOOK (widget);
-  gint old_page_num = gtk_notebook_get_current_page (notebook);
+  int old_page_num = gtk_notebook_get_current_page (notebook);
  
   if (page_num == old_page_num)
     return;
@@ -3720,7 +3720,7 @@ tab_expand (GtkToggleButton *button, GtkWidget *child)
 }
 
 static void
-create_pages (GtkNotebook *notebook, gint start, gint end)
+create_pages (GtkNotebook *notebook, int start, int end)
 {
   GtkWidget *child = NULL;
   GtkWidget *button;
@@ -3730,7 +3730,7 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
   GtkWidget *label_box;
   GtkWidget *menu_box;
   GtkWidget *pixwid;
-  gint i;
+  int i;
   char buffer[32];
   char accel_buffer[32];
 
@@ -3816,7 +3816,7 @@ notebook_type_changed (GtkWidget *optionmenu,
                       gpointer   data)
 {
   GtkNotebook *notebook;
-  gint i, c;
+  int i, c;
 
   enum {
     STANDARD,
@@ -4863,8 +4863,8 @@ create_surface_states (GtkWidget *widget)
 
 static void
 get_ints (GtkWidget *window,
-          gint      *a,
-          gint      *b)
+          int       *a,
+          int       *b)
 {
   GtkWidget *spin1;
   GtkWidget *spin2;
@@ -4880,7 +4880,7 @@ static void
 set_size_callback (GtkWidget *widget,
                    gpointer   data)
 {
-  gint w, h;
+  int w, h;
   
   get_ints (data, &w, &h);
 
@@ -4899,7 +4899,7 @@ static void
 set_default_size_callback (GtkWidget *widget,
                            gpointer   data)
 {
-  gint w, h;
+  int w, h;
   
   get_ints (data, &w, &h);
 
@@ -4919,7 +4919,7 @@ static void
 set_size_request_callback (GtkWidget *widget,
                           gpointer   data)
 {
-  gint w, h;
+  int w, h;
   
   get_ints (data, &w, &h);
 
@@ -5158,7 +5158,7 @@ static void
 progressbar_toggle_orientation (GtkWidget *widget, gpointer data)
 {
   ProgressData *pdata;
-  gint i;
+  int i;
 
   pdata = (ProgressData *) data;
 
@@ -5194,7 +5194,7 @@ progressbar_toggle_ellipsize (GtkWidget *widget,
   ProgressData *pdata = data;
   if (gtk_widget_is_drawable (widget))
     {
-      gint i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
+      int i = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
       gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (pdata->pbar), i);
     }
 }
@@ -5502,7 +5502,7 @@ hide_native (GtkWidget *button,
 
 static void
 native_response (GtkNativeDialog *self,
-                 gint response_id,
+                 int response_id,
                  GtkWidget *label)
 {
   static int count = 0;
index 2d825b41587ec13494521204417ad7a0e49ae65e..063a916f5b39d7e468e7dd376a62e0a2c17780f3 100644 (file)
@@ -655,7 +655,7 @@ static GtkWidget *
 create_window (void)
 {
   GtkWidget *window, *vbox, *button;
-  gint i;
+  int i;
 
   window = gtk_window_new ();
   vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
index 000304dc5d745805454a5ee4ccf405fb48f06b3c..f7a97223c798e05a492a0183d2b756d1f29c4a5d 100644 (file)
@@ -117,7 +117,7 @@ keynav_failed (GtkWidget        *view,
   GtkTreePath *path;
   GtkTreeModel *model;
   GtkTreeIter iter;
-  gint col;
+  int col;
   GtkTreePath *sel;
 
   if (view == views->view1 && direction == GTK_DIR_DOWN)
index 4fb6723ead76b95e8f25f7f1a2ad0693be33def8..a09aba44f9621b3117cdf438b691400a9bb0ed1a 100644 (file)
@@ -124,15 +124,15 @@ swap_rows (GtkWidget *button, GtkIconView *icon_list)
 }
 
 static void
-add_n_items (GtkIconView *icon_list, gint n)
+add_n_items (GtkIconView *icon_list, int n)
 {
-  static gint count = NUMBER_OF_ITEMS;
+  static int count = NUMBER_OF_ITEMS;
 
   GtkTreeIter iter;
   GtkListStore *store;
   GdkPixbuf *pixbuf;
   gchar *str, *str2;
-  gint i;
+  int i;
 
   store = GTK_LIST_STORE (gtk_icon_view_get_model (icon_list));
   pixbuf = gdk_pixbuf_new_from_file ("gnome-textfile.png", NULL);
@@ -390,8 +390,8 @@ popup_menu_handler (GtkWidget *widget)
   return TRUE;
 }
 
-gint
-main (gint argc, gchar **argv)
+int
+main (int argc, gchar **argv)
 {
   GtkWidget *paned, *tv;
   GtkWidget *window, *icon_list, *scrolled_window;
index ba7252958494b8b619b52e81760e91f1723d082a..be9d49f64000bc0018ecae335e6fac93c17cf25e 100644 (file)
@@ -30,7 +30,7 @@ kinetic_scrolling (void)
   GtkListStore *store;
   GtkWidget *textview;
   GdkContentFormats *targets;
-  gint i;
+  int i;
 
   window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
index b781c289807b638f36b544c793a9b4ab19da69de..25579739beb6d2da46fdb6e07a48f49d9805269f 100644 (file)
@@ -9,7 +9,7 @@ struct _Row
 {
   GtkListBoxRow parent_instance;
   GtkWidget *label;
-  gint sort_id;
+  int sort_id;
 };
 
 struct _RowClass
@@ -44,7 +44,7 @@ row_class_init (RowClass *class)
 }
 
 static GtkWidget *
-row_new (const gchar* text, gint sort_id) {
+row_new (const gchar* text, int sort_id) {
   Row *row;
 
   row = g_object_new (row_get_type (), NULL);
index 11229c557a344422d29834531ea016773d7c9723..e9465f63bda50224229ce9b609a4a9c63910b8ec 100644 (file)
@@ -50,7 +50,7 @@ static void
 add_row_below (GtkButton *button, GtkWidget *child)
 {
   GtkWidget *revealer, *row, *list;
-  gint index;
+  int index;
 
   row = gtk_widget_get_parent (child);
   index = gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (row));
@@ -109,7 +109,7 @@ quit_cb (GtkWidget *widget,
 int main (int argc, char *argv[])
 {
   GtkWidget *window, *list, *sw, *row;
-  gint i;
+  int i;
   gchar *text;
   gboolean done = FALSE;
 
index f3f6b3b0ddba0502a8e0d5cbf06228a976fc095f..a800f3b9f32b58310e93236c0693079364c82a2b 100644 (file)
@@ -126,7 +126,7 @@ main (int argc, char *argv[])
 {
   GtkWidget *window, *list, *sw, *row;
   GtkWidget *hbox, *vbox, *combo, *button;
-  gint i;
+  int i;
   gchar *text;
   GtkCssProvider *provider;
 
index ce0500d24e0d425780d52be2848b52956db748de..e7bbf3ed5b630eddd3a2b91850c6f739c1df767b 100644 (file)
@@ -93,7 +93,7 @@ new_window (GApplication *app)
   GtkWidget *row_content;
   GtkListBoxRow *row;
 
-  gint i;
+  int i;
   gchar *text, *text2;
 
   window = gtk_application_window_new (GTK_APPLICATION (app));
index c4cecc3032854c421b58318184c7538cea29cf05..d6222c622d20a47aef332c60915db645ca1d87c8 100644 (file)
@@ -38,7 +38,7 @@ got_reply (GMountOperation       *op,
 
       if (ask_question)
         {
-          gint choice = g_mount_operation_get_choice (op);
+          int choice = g_mount_operation_get_choice (op);
           g_print ("User chose: %d\n", choice);
         }
       else
index dc6c6b2b1541460da62abe2573704ea9fa1daef2..3858aa6383eb95278143bc4aed4f9b434aa3b581 100644 (file)
@@ -58,8 +58,8 @@ const char *tabs4 [] = {
 static GtkNotebook*
 window_creation_function (GtkNotebook *source_notebook,
                           GtkWidget   *child,
-                          gint         x,
-                          gint         y,
+                          int          x,
+                          int          y,
                           gpointer     data)
 {
   GtkWidget *window, *notebook;
@@ -230,7 +230,7 @@ create_notebook_with_notebooks (const char      **labels,
                                 GtkPositionType   pos)
 {
   GtkWidget *notebook, *title, *page;
-  gint count = 0;
+  int count = 0;
 
   notebook = gtk_notebook_new ();
   g_signal_connect (notebook, "create-window",
@@ -286,8 +286,8 @@ quit_cb (GtkWidget *widget,
   g_main_context_wakeup (NULL);
 }
 
-gint
-main (gint argc, gchar *argv[])
+int
+main (int argc, gchar *argv[])
 {
   GtkWidget *window, *grid;
   gboolean done = FALSE;
index 6ef1e0ee4978a7d88f9cb8e3010bdde4e059e8b3..91d979bfc1947e8591d606437c797f70c0dc0bb1 100644 (file)
@@ -50,7 +50,7 @@ load_types (void)
 int
 main (int argc, char *argv[])
 {
-  gint i;
+  int i;
 
   gtk_init ();
   load_types ();
index a36080f21ee2d51f1a368dfa65f5a4b3daa681bf..9ec28b3caa8e25f8c90c55e11313aa93d10c4cbe 100644 (file)
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 
-gint
-main (gint argc,
+int
+main (int argc,
       gchar ** argv)
 {
   GtkWidget *window, *revealer, *box, *widget, *entry;
index 70820d66f5a2632ca336f7d9a3be6269be003ede..94f808f7e8f37a10e981a3a25bf908d673d1973d 100644 (file)
@@ -23,10 +23,10 @@ static guint add_rows_id = 0;
 static void
 populate_list (GtkListBox *list)
 {
-  gint i;
+  int i;
   gchar *text;
   GtkWidget *row, *label;
-  gint n;
+  int n;
   GtkWidget *child;
 
   for (child = gtk_widget_get_first_child (GTK_WIDGET (list)), n = 0;
index ca772c12dd9dbc51134fd2693a5c6e0401565146..6642ef3b447a3f4a548242b54c03abe94bcb4bdc 100644 (file)
@@ -27,7 +27,7 @@ content_width_changed (GtkSpinButton *spin_button,
   gdouble value;
 
   value = gtk_spin_button_get_value (spin_button);
-  gtk_scrolled_window_set_min_content_width (swindow, (gint)value);
+  gtk_scrolled_window_set_min_content_width (swindow, (int)value);
 }
 
 static void
@@ -38,7 +38,7 @@ content_height_changed (GtkSpinButton *spin_button,
   gdouble value;
 
   value = gtk_spin_button_get_value (spin_button);
-  gtk_scrolled_window_set_min_content_height (swindow, (gint)value);
+  gtk_scrolled_window_set_min_content_height (swindow, (int)value);
 }
 
 static void
index 7157c8ec02a1811ac305549c799537b910932836..325e80b2f0fa902211997ad79274053a8cd8f622 100644 (file)
@@ -78,7 +78,7 @@ selectable_row_new (void)
 }
 
 static void
-add_row (GtkWidget *list, gint i)
+add_row (GtkWidget *list, int i)
 {
   GtkWidget *row;
   GtkWidget *label;
@@ -190,7 +190,7 @@ main (int argc, char *argv[])
   GtkWidget *window;
   GtkWidget *list;
   GtkWidget *button;
-  gint i;
+  int i;
   GSimpleActionGroup *group;
   GSimpleAction *action;
 
index ef8f2db648e7978d6f25736b91c5e2cc1bd61794..0d21cf3a0bb07c428cb579342f2fd364e07840b2 100644 (file)
@@ -18,7 +18,7 @@
 #include "config.h"
 #include <gtk/gtk.h>
 
-static gint num_windows = 0;
+static int num_windows = 0;
 
 static gboolean done = FALSE;
 
index 39e77ff1908a355ec8b6b4288ad370fc4bb9cbbe..571d58fc07e5cf2c649152f31c410c5e136462fa 100644 (file)
@@ -53,7 +53,7 @@ on_back_button_clicked (GtkButton *button, gpointer user_data)
 {
   const gchar *seq[] = { "1", "2", "3" };
   const gchar *vis;
-  gint i;
+  int i;
 
   vis = gtk_stack_get_visible_child_name (GTK_STACK (stack));
 
@@ -72,7 +72,7 @@ on_forward_button_clicked (GtkButton *button, gpointer user_data)
 {
   const gchar *seq[] = { "1", "2", "3" };
   const gchar *vis;
-  gint i;
+  int i;
 
   vis = gtk_stack_get_visible_child_name (GTK_STACK (stack));
 
@@ -104,8 +104,8 @@ update_forward_button_sensitivity (GtkStack *_stack, GParamSpec *pspec, GtkWidge
   gtk_widget_set_sensitive (button, g_strcmp0 (vis, "3") != 0);
 }
 
-gint
-main (gint argc,
+int
+main (int argc,
       gchar ** argv)
 {
   GtkWidget *window, *box, *button, *hbox, *combo, *layout;
index 8332b4d8a19122e8cc151b444f59c66de37066f1..fddc86daf5c32baf656dc9d270a99c377253a3b9 100644 (file)
@@ -126,8 +126,8 @@ do_delete (gpointer     funcs_data,
 
 static void
 do_select (gpointer funcs_data,
-           gint     selection_insert,
-           gint     selection_bound)
+           int      selection_insert,
+           int      selection_bound)
 {
   Text *text = funcs_data;
 
index e7a91889ff8cb19cc8d3a217d732ba8d249ae53c..a955d56dd5054debcc28bc1bada929fc8b780f3a 100644 (file)
@@ -59,8 +59,8 @@ my_tooltip_class_init (MyTooltipClass *tt_class)
 
 static gboolean
 query_tooltip_cb (GtkWidget  *widget,
-                 gint        x,
-                 gint        y,
+                 int         x,
+                 int         y,
                  gboolean    keyboard_tip,
                  GtkTooltip *tooltip,
                  gpointer    data)
@@ -73,8 +73,8 @@ query_tooltip_cb (GtkWidget  *widget,
 
 static gboolean
 query_tooltip_text_view_cb (GtkWidget  *widget,
-                           gint        x,
-                           gint        y,
+                           int         x,
+                           int         y,
                            gboolean    keyboard_tip,
                            GtkTooltip *tooltip,
                            gpointer    data)
@@ -86,14 +86,14 @@ query_tooltip_text_view_cb (GtkWidget  *widget,
 
   if (keyboard_tip)
     {
-      gint offset;
+      int offset;
 
       g_object_get (buffer, "cursor-position", &offset, NULL);
       gtk_text_buffer_get_iter_at_offset (buffer, &iter, offset);
     }
   else
     {
-      gint bx, by, trailing;
+      int bx, by, trailing;
 
       gtk_text_view_window_to_buffer_coords (text_view, GTK_TEXT_WINDOW_TEXT,
                                             x, y, &bx, &by);
@@ -110,8 +110,8 @@ query_tooltip_text_view_cb (GtkWidget  *widget,
 
 static gboolean
 query_tooltip_tree_view_cb (GtkWidget  *widget,
-                           gint        x,
-                           gint        y,
+                           int         x,
+                           int         y,
                            gboolean    keyboard_tip,
                            GtkTooltip *tooltip,
                            gpointer    data)
@@ -179,8 +179,8 @@ selection_changed_cb (GtkTreeSelection *selection,
 
 static struct Rectangle
 {
-  gint x;
-  gint y;
+  int x;
+  int y;
   gfloat r;
   gfloat g;
   gfloat b;
@@ -195,13 +195,13 @@ rectangles[] =
 
 static gboolean
 query_tooltip_drawing_area_cb (GtkWidget  *widget,
-                              gint        x,
-                              gint        y,
+                              int         x,
+                              int         y,
                               gboolean    keyboard_tip,
                               GtkTooltip *tooltip,
                               gpointer    data)
 {
-  gint i;
+  int i;
 
   if (keyboard_tip)
     return FALSE;
@@ -228,7 +228,7 @@ drawing_area_draw (GtkDrawingArea *drawing_area,
                    int             height,
                   gpointer        data)
 {
-  gint i;
+  int i;
 
   cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
   cairo_paint (cr);
@@ -249,8 +249,8 @@ drawing_area_draw (GtkDrawingArea *drawing_area,
 
 static gboolean
 query_tooltip_label_cb (GtkWidget  *widget,
-                       gint        x,
-                       gint        y,
+                       int         x,
+                       int         y,
                        gboolean    keyboard_tip,
                        GtkTooltip *tooltip,
                        gpointer    data)
index 47030f8f9bde4afc57bc83b798922353969dec74..768418d315afcbc5b02ed419d227bf586a2ab702 100644 (file)
@@ -68,7 +68,7 @@ struct _ViewColumnModel
   GtkListStore parent;
   GtkTreeView *view;
   GList *columns;
-  gint stamp;
+  int stamp;
 };
 
 struct _ViewColumnModelClass
@@ -94,7 +94,7 @@ static void view_column_model_init (ViewColumnModel *model)
   model->stamp = g_random_int ();
 }
 
-static gint
+static int
 view_column_model_get_n_columns (GtkTreeModel *tree_model)
 {
   return 2;
@@ -102,7 +102,7 @@ view_column_model_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 view_column_model_get_column_type (GtkTreeModel *tree_model,
-                                  gint          index)
+                                  int           index)
 {
   switch (index)
     {
@@ -123,7 +123,7 @@ view_column_model_get_iter (GtkTreeModel *tree_model,
 {
   ViewColumnModel *view_model = (ViewColumnModel *)tree_model;
   GList *list;
-  gint i;
+  int i;
 
   g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
 
@@ -146,7 +146,7 @@ view_column_model_get_path (GtkTreeModel *tree_model,
   ViewColumnModel *view_model = (ViewColumnModel *)tree_model;
   GtkTreePath *retval;
   GList *list;
-  gint i = 0;
+  int i = 0;
 
   g_return_val_if_fail (iter->stamp == view_model->stamp, NULL);
 
@@ -167,7 +167,7 @@ view_column_model_get_path (GtkTreeModel *tree_model,
 static void
 view_column_model_get_value (GtkTreeModel *tree_model,
                             GtkTreeIter  *iter,
-                            gint          column,
+                            int           column,
                             GValue       *value)
 {
 #ifndef G_DISABLE_CHECKS
@@ -237,18 +237,18 @@ view_column_model_iter_has_child (GtkTreeModel *tree_model,
   return FALSE;
 }
 
-static gint
+static int
 view_column_model_iter_n_children (GtkTreeModel *tree_model,
                                   GtkTreeIter  *iter)
 {
   return g_list_length (((ViewColumnModel *)tree_model)->columns);
 }
 
-static gint
+static int
 view_column_model_iter_nth_child (GtkTreeModel *tree_model,
                                  GtkTreeIter  *iter,
                                  GtkTreeIter  *parent,
-                                 gint          n)
+                                 int           n)
 {
   ViewColumnModel *view_model = (ViewColumnModel *)tree_model;
 
@@ -385,7 +385,7 @@ static void
 update_columns (GtkTreeView *view, ViewColumnModel *view_model)
 {
   GList *old_columns = view_model->columns;
-  gint old_length, length;
+  int old_length, length;
   GList *a, *b;
 
   view_model->columns = gtk_tree_view_get_columns (view_model->view);
@@ -396,7 +396,7 @@ update_columns (GtkTreeView *view, ViewColumnModel *view_model)
   if (length != old_length)
     {
       GtkTreePath *path;
-      gint i = 0;
+      int i = 0;
 
       /* where are they different */
       for (a = old_columns, b = view_model->columns; a && b; a = a->next, b = b->next)
@@ -423,9 +423,9 @@ update_columns (GtkTreeView *view, ViewColumnModel *view_model)
     }
   else
     {
-      gint i;
-      gint m = 0, n = 1;
-      gint *new_order;
+      int i;
+      int m = 0, n = 1;
+      int *new_order;
       GtkTreePath *path;
 
       new_order = g_new (int, length);
@@ -505,7 +505,7 @@ view_column_model_new (GtkTreeView *view)
 static void
 add_clicked (GtkWidget *button, gpointer data)
 {
-  static gint i = 0;
+  static int i = 0;
 
   GtkTreeIter iter;
   GtkTreeViewColumn *column;
@@ -608,7 +608,7 @@ move_to_right (GtkTreeIter  *src_iter,
 {
   gchar *label;
   GtkTreeViewColumn *column;
-  gint before = -1;
+  int before = -1;
 
   gtk_tree_model_get (GTK_TREE_MODEL (left_tree_model),
                      src_iter, 0, &label, 1, &column, -1);
@@ -637,7 +637,7 @@ move_up_or_down (GtkTreeModel *src,
 {
   GtkTreeViewColumn *column;
   gchar *label;
-  gint before = -1;
+  int before = -1;
   
   gtk_tree_model_get (src, src_iter, 0, &label, 1, &column, -1);
 
@@ -732,7 +732,7 @@ main (int argc, char *argv[])
   GtkWidget *swindow;
   GtkTreeModel *sample_model;
   GdkContentFormats *targets;
-  gint i;
+  int i;
   gboolean done = FALSE;
 
   gtk_init ();
index e528d50191ce9cbe51dd5e8289baa2864b7294d9..e3b17668efde87ca170ff2a7218a3d478866e32a 100644 (file)
@@ -23,7 +23,7 @@ typedef struct {
   const gchar *string;
   gboolean is_editable;
   gboolean is_sensitive;
-  gint progress;
+  int progress;
 } ListEntry;
 
 enum {
@@ -52,7 +52,7 @@ create_model (void)
 {
   GtkTreeStore *model;
   GtkTreeIter iter;
-  gint i;
+  int i;
 
   model = gtk_tree_store_new (NUM_COLUMNS,
                              G_TYPE_STRING,
@@ -184,7 +184,7 @@ enum {
 };
 
 static void
-create_control (GtkWidget *box, gint number, gint cntl, CallbackData *data)
+create_control (GtkWidget *box, int number, int cntl, CallbackData *data)
 {
   GtkWidget *checkbutton;
   GCallback  callback = NULL;
@@ -227,8 +227,8 @@ quit_cb (GtkWidget *widget,
   g_main_context_wakeup (NULL);
 }
 
-gint
-main (gint argc, gchar **argv)
+int
+main (int argc, gchar **argv)
 {
   GtkWidget *window;
   GtkWidget *scrolled_window;
index de9e23587881b6842ee679dbfd56b53c20498318..6b882bff363cfb36a366ab055a821724b3f7a8df 100644 (file)
@@ -46,7 +46,7 @@ static const char *words[] =
 static void
 initialize_model (void)
 {
-  gint i;
+  int i;
   GtkTreeIter iter;
 
   model = (GtkTreeModel *) gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING);
@@ -63,7 +63,7 @@ initialize_model (void)
 static void
 futz_row (void)
 {
-  gint i;
+  int i;
   GtkTreePath *path;
   GtkTreeIter iter;
   GtkTreeIter iter2;
@@ -110,7 +110,7 @@ futz_row (void)
 static gboolean
 futz (void)
 {
-  gint i;
+  int i;
 
   for (i = 0; i < 15; i++)
     futz_row ();
index 1f6f2d1dd813ca2e8646da1d49699e6f2b3efec9..da5802c3bf668c96ca46ff00efafc7c6578c6fdc 100644 (file)
@@ -324,7 +324,7 @@ set_indicator_size (GtkTreeViewColumn *column,
                    GtkTreeIter *iter,
                    gpointer data)
 {
-  gint size;
+  int size;
   GtkTreePath *path;
 
   path = gtk_tree_model_get_path (model, iter);
@@ -354,7 +354,7 @@ main (int argc, char *argv[])
   GtkWidget *tree_view;
   GtkTreeModel *model;
   GtkCellRenderer *renderer;
-  gint col_offset;
+  int col_offset;
   GtkTreeViewColumn *column;
   gboolean done = FALSE;
 
index 2becbd0d1b2a8607de57770d1b9d9c619e19c970..dffa4647d6e22805010a2ae8f298e8e3b450e171 100644 (file)
@@ -25,8 +25,8 @@
 
 #include <gtk/gtk.h>
 
-static gint repeats = 2;
-static gint max_size = 8;
+static int repeats = 2;
+static int max_size = 8;
 
 static GOptionEntry entries[] = {
   { "repeats", 'r', 0, G_OPTION_ARG_INT, &repeats, "Average over N repetitions", "N" },
@@ -37,13 +37,13 @@ static GOptionEntry entries[] = {
 
 typedef void (ClearFunc)(GtkTreeModel *model);
 typedef void (InsertFunc)(GtkTreeModel *model,
-                         gint          items,
-                         gint          i);
+                         int           items,
+                         int           i);
 
 static void
 list_store_append (GtkTreeModel *model,
-                  gint          items,
-                  gint          i)
+                  int           items,
+                  int           i)
 {
   GtkListStore *store = GTK_LIST_STORE (model);
   GtkTreeIter iter;
@@ -57,8 +57,8 @@ list_store_append (GtkTreeModel *model,
 
 static void
 list_store_prepend (GtkTreeModel *model,
-                   gint          items,
-                   gint          i)
+                   int           items,
+                   int           i)
 {
   GtkListStore *store = GTK_LIST_STORE (model);
   GtkTreeIter iter;
@@ -72,13 +72,13 @@ list_store_prepend (GtkTreeModel *model,
 
 static void
 list_store_insert (GtkTreeModel *model,
-                  gint          items,
-                  gint          i)
+                  int           items,
+                  int           i)
 {
   GtkListStore *store = GTK_LIST_STORE (model);
   GtkTreeIter iter;
   gchar *text;
-  gint n;
+  int n;
 
   text = g_strdup_printf ("row %d", i);
   n = g_random_int_range (0, i + 1);
@@ -87,14 +87,14 @@ list_store_insert (GtkTreeModel *model,
   g_free (text);
 }
 
-static gint
+static int
 compare (GtkTreeModel *model,
         GtkTreeIter  *a,
         GtkTreeIter  *b,
         gpointer      data)
 {
   gchar *str_a, *str_b;
-  gint result;
+  int result;
 
   gtk_tree_model_get (model, a, 1, &str_a, -1);
   gtk_tree_model_get (model, b, 1, &str_b, -1);
@@ -109,8 +109,8 @@ compare (GtkTreeModel *model,
 
 static void
 tree_store_append (GtkTreeModel *model,
-                  gint          items,
-                  gint          i)
+                  int           items,
+                  int           i)
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
@@ -124,8 +124,8 @@ tree_store_append (GtkTreeModel *model,
 
 static void
 tree_store_prepend (GtkTreeModel *model,
-                   gint          items,
-                   gint          i)
+                   int           items,
+                   int           i)
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
@@ -139,13 +139,13 @@ tree_store_prepend (GtkTreeModel *model,
 
 static void
 tree_store_insert_flat (GtkTreeModel *model,
-                       gint          items,
-                       gint          i)
+                       int           items,
+                       int           i)
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
   gchar *text;
-  gint n;
+  int n;
 
   text = g_strdup_printf ("row %d", i);
   n = g_random_int_range (0, i + 1);
@@ -155,8 +155,8 @@ tree_store_insert_flat (GtkTreeModel *model,
 }
 
 typedef struct {
-  gint i;
-  gint n;
+  int i;
+  int n;
   gboolean found;
   GtkTreeIter iter;
 } FindData;
@@ -183,8 +183,8 @@ find_nth (GtkTreeModel *model,
 
 static void
 tree_store_insert_deep (GtkTreeModel *model,
-                       gint          items,
-                       gint          i)
+                       int           items,
+                       int           i)
 {
   GtkTreeStore *store = GTK_TREE_STORE (model);
   GtkTreeIter iter;
@@ -209,7 +209,7 @@ test_run (const char        *title,
          ClearFunc    *clear,
          InsertFunc   *insert)
 {
-  gint i, k, d, items;
+  int i, k, d, items;
   GTimer *timer;
   gdouble elapsed;
   int memused;
index e2c26e90f6438819f07f6947714dcc58b0fab874..80be31a0bee7f3a6b38bbae07b3fc7fc76e0d0d2 100644 (file)
@@ -2,18 +2,18 @@
 
 static gboolean
 clicked_icon (GtkTreeView  *tv,
-              gint          x,
-              gint          y,
+              int           x,
+              int           y,
               GtkTreePath **path)
 {
   GtkTreeViewColumn *col;
-  gint cell_x, cell_y;
-  gint cell_pos, cell_width;
+  int cell_x, cell_y;
+  int cell_pos, cell_width;
   GList *cells, *l;
-  gint depth;
-  gint level_indentation;
-  gint expander_size;
-  gint indent;
+  int depth;
+  int level_indentation;
+  int expander_size;
+  int indent;
 
   if (gtk_tree_view_get_path_at_pos (tv, x, y, path, &col, &cell_x, &cell_y))
     {
@@ -60,7 +60,7 @@ release_event (GtkGestureClick *gesture,
                GtkTreeView     *tv)
 {
   GtkTreePath *path;
-  gint tx, ty;
+  int tx, ty;
 
   gtk_tree_view_convert_widget_to_tree_coords (tv, x, y, &tx, &ty);
 
index a85240d06e3c67d1be163e0e573ebeb23c88d0ea..8b923c11dca9a054feb50973c4bb46aed7c40a74 100644 (file)
@@ -27,7 +27,7 @@ struct _ListSort
   const gchar *word_2;
   const gchar *word_3;
   const gchar *word_4;
-  gint number_1;
+  int number_1;
 };
 
 static ListSort data[] =
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   GtkTreeIter iter;
-  gint i;
+  int i;
 
   GtkWidget *entry, *button;
   GtkWidget *window2, *vbox2, *scrolled_window2, *tree_view2;
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
   /* 12 iters now, 12 later... */
   for (i = 0; data[i].word_1 != NULL; i++)
     {
-      gint k;
+      int k;
       GtkTreeIter child_iter;
 
 
@@ -374,7 +374,7 @@ main (int argc, char *argv[])
 
   for (i = 0; data[i].word_1 != NULL; i++)
     {
-      gint k;
+      int k;
       
       gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL);
       gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
index f6854a74d73c55b30c9b09e32f2cb636e21f7ad1..2efb476b22e134b814689c43cb594e83e29c215d 100644 (file)
@@ -66,7 +66,7 @@ struct _GtkTreeModelTypes
 {
   GObject parent;
 
-  gint stamp;
+  int stamp;
 };
 
 struct _GtkTreeModelTypesClass
@@ -74,9 +74,9 @@ struct _GtkTreeModelTypesClass
   GObjectClass parent_class;
 
   guint        (* get_flags)       (GtkTreeModel *tree_model);   
-  gint         (* get_n_columns)   (GtkTreeModel *tree_model);
+  int          (* get_n_columns)   (GtkTreeModel *tree_model);
   GType        (* get_column_type) (GtkTreeModel *tree_model,
-                                   gint          index);
+                                   int           index);
   gboolean     (* get_iter)        (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreePath  *path);
@@ -84,7 +84,7 @@ struct _GtkTreeModelTypesClass
                                    GtkTreeIter  *iter);
   void         (* get_value)       (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
-                                   gint          column,
+                                   int           column,
                                    GValue       *value);
   gboolean     (* iter_next)       (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter);
@@ -93,12 +93,12 @@ struct _GtkTreeModelTypesClass
                                    GtkTreeIter  *parent);
   gboolean     (* iter_has_child)  (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter);
-  gint         (* iter_n_children) (GtkTreeModel *tree_model,
+  int          (* iter_n_children) (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter);
   gboolean     (* iter_nth_child)  (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreeIter  *parent,
-                                   gint          n);
+                                   int           n);
   gboolean     (* iter_parent)     (GtkTreeModel *tree_model,
                                    GtkTreeIter  *iter,
                                    GtkTreeIter  *child);
@@ -502,7 +502,7 @@ create_list_model (void)
 {
   GtkListStore *store;
   GtkTreeIter iter;
-  gint i;
+  int i;
   GType *t;
 
   t = get_model_types ();
@@ -543,7 +543,7 @@ typesystem_recurse (GType        type,
 {
   GType* children;
   guint n_children = 0;
-  gint i;
+  int i;
   GtkTreeIter iter;
   gchar *str;
   
@@ -575,7 +575,7 @@ static GtkTreeModel*
 create_tree_model (void)
 {
   GtkTreeStore *store;
-  gint i;
+  int i;
   GType *t;
   
   /* Make the tree more interesting */
@@ -608,7 +608,7 @@ static void
 model_selected (GtkComboBox *combo_box, gpointer data)
 {
   GtkTreeView *tree_view = GTK_TREE_VIEW (data);
-  gint hist;
+  int hist;
 
   hist = gtk_combo_box_get_active (combo_box);
 
@@ -622,7 +622,7 @@ static void
 columns_selected (GtkComboBox *combo_box, gpointer data)
 {
   GtkTreeView *tree_view = GTK_TREE_VIEW (data);
-  gint hist;
+  int hist;
 
   hist = gtk_combo_box_get_active (combo_box);
 
@@ -663,7 +663,7 @@ main (int    argc,
   GtkWidget *combo_box;
   GtkTreeModel *model;
   GdkContentFormats *targets;
-  gint i;
+  int i;
   gboolean done = FALSE;
   
   gtk_init ();
@@ -769,14 +769,14 @@ main (int    argc,
 
 static void         gtk_tree_model_types_init                 (GtkTreeModelTypes      *model_types);
 static void         gtk_tree_model_types_tree_model_init      (GtkTreeModelIface   *iface);
-static gint         gtk_real_model_types_get_n_columns   (GtkTreeModel        *tree_model);
+static int          gtk_real_model_types_get_n_columns   (GtkTreeModel        *tree_model);
 static GType        gtk_real_model_types_get_column_type (GtkTreeModel        *tree_model,
-                                                          gint                 index);
+                                                          int                  index);
 static GtkTreePath *gtk_real_model_types_get_path        (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter);
 static void         gtk_real_model_types_get_value       (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter,
-                                                          gint                 column,
+                                                          int                  column,
                                                           GValue              *value);
 static gboolean     gtk_real_model_types_iter_next       (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter);
@@ -785,12 +785,12 @@ static gboolean     gtk_real_model_types_iter_children   (GtkTreeModel        *t
                                                           GtkTreeIter         *parent);
 static gboolean     gtk_real_model_types_iter_has_child  (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter);
-static gint         gtk_real_model_types_iter_n_children (GtkTreeModel        *tree_model,
+static int          gtk_real_model_types_iter_n_children (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter);
 static gboolean     gtk_real_model_types_iter_nth_child  (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter,
                                                           GtkTreeIter         *parent,
-                                                          gint                 n);
+                                                          int                  n);
 static gboolean     gtk_real_model_types_iter_parent     (GtkTreeModel        *tree_model,
                                                           GtkTreeIter         *iter,
                                                           GtkTreeIter         *child);
@@ -870,7 +870,7 @@ static GType column_types[] = {
   G_TYPE_STRING  /* type name */
 };
   
-static gint
+static int
 gtk_real_model_types_get_n_columns (GtkTreeModel *tree_model)
 {
   return G_N_ELEMENTS (column_types);
@@ -878,7 +878,7 @@ gtk_real_model_types_get_n_columns (GtkTreeModel *tree_model)
 
 static GType
 gtk_real_model_types_get_column_type (GtkTreeModel *tree_model,
-                                      gint          index)
+                                      int           index)
 {
   g_return_val_if_fail (index < G_N_ELEMENTS (column_types), G_TYPE_INVALID);
   
@@ -919,7 +919,7 @@ gtk_real_model_types_get_path (GtkTreeModel *tree_model,
   while (parent != G_TYPE_INVALID)
     {
       GType* children = g_type_children (parent, NULL);
-      gint i = 0;
+      int i = 0;
 
       if (!children || children[0] == G_TYPE_INVALID)
         {
@@ -947,7 +947,7 @@ gtk_real_model_types_get_path (GtkTreeModel *tree_model,
 static void
 gtk_real_model_types_get_value (GtkTreeModel *tree_model,
                                 GtkTreeIter  *iter,
-                                gint          column,
+                                int           column,
                                 GValue       *value)
 {
   GType type;
@@ -1008,7 +1008,7 @@ gtk_real_model_types_iter_next (GtkTreeModel  *tree_model,
   else
     {
       GType* children = g_type_children (parent, NULL);
-      gint i = 0;
+      int i = 0;
 
       g_assert (children != NULL);
       
@@ -1079,7 +1079,7 @@ gtk_real_model_types_iter_has_child (GtkTreeModel *tree_model,
     }
 }
 
-static gint
+static int
 gtk_real_model_types_iter_n_children (GtkTreeModel *tree_model,
                                       GtkTreeIter  *iter)
 {
@@ -1107,7 +1107,7 @@ static gboolean
 gtk_real_model_types_iter_nth_child (GtkTreeModel *tree_model,
                                      GtkTreeIter  *iter,
                                      GtkTreeIter  *parent,
-                                     gint          n)
+                                     int           n)
 {  
   if (parent == NULL)
     {
@@ -1183,10 +1183,10 @@ gtk_real_model_types_iter_parent (GtkTreeModel *tree_model,
 static void
 treestore_torture_recurse (GtkTreeStore *store,
                            GtkTreeIter  *root,
-                           gint          depth)
+                           int           depth)
 {
   GtkTreeModel *model;
-  gint i;
+  int i;
   GtkTreeIter iter;  
   
   model = GTK_TREE_MODEL (store);    
@@ -1284,7 +1284,7 @@ run_automated_tests (void)
     /* Make sure list store mutations don't crash anything */
     GtkListStore *store;
     GtkTreeModel *model;
-    gint i;
+    int i;
     GtkTreeIter iter;
     
     store = gtk_list_store_new (1, G_TYPE_INT);
index ed89ece29a0a465f61f1e70ce8f9670f6d5008f0..2ef1929977fa5c402c822ab8d175ba3703ebc4a0 100644 (file)
@@ -30,7 +30,7 @@ struct _TreeEntry {
   const gchar *description;
   const gchar *fine_print;
   const gchar *fine_print_color;
-  gint progress;
+  int progress;
   TreeEntry *entries;
 };
 
@@ -249,7 +249,7 @@ populate_model (GtkTreeStore *model,
                TreeEntry    *entries)
 {
   GtkTreeIter iter;
-  gint        i;
+  int         i;
 
   for (i = 0; entries[i].info != NULL; i++)
     {
@@ -272,7 +272,7 @@ static GtkTreeModel *
 create_model (void)
 {
   GtkTreeStore *model;
-  gint          i;
+  int           i;
 
   model = gtk_tree_store_new (NUM_COLUMNS,
                              G_TYPE_STRING,
@@ -299,8 +299,8 @@ quit_cb (GtkWidget *widget,
   g_main_context_wakeup (NULL);
 }
 
-gint
-main (gint argc, gchar **argv)
+int
+main (int argc, gchar **argv)
 {
   GtkWidget *window;
   GtkWidget *scrolled_window;
index b86577a69680472b7c3f995486540641065fbcc6..7fb886dcf445fa754cad10abd2d1dc8bb20c739d 100644 (file)
@@ -27,7 +27,7 @@ value_changed (GtkWidget *button,
 
 static void
 response_cb (GtkDialog *dialog,
-             gint       arg1,
+             int        arg1,
              gpointer   user_data)
 {
   gtk_window_destroy (GTK_WINDOW (dialog));
index ae6b2fcaa5b5ac951a3fbbfa26164cc975ccf83c..3b7e795a47ac632a3780b77fcce1df5a498bc310 100644 (file)
@@ -23,7 +23,7 @@ show_dialog (void)
 {
   GtkWidget *dialog;
   GtkWidget *label;
-  gint width_chars, max_width_chars, default_width, default_height;
+  int width_chars, max_width_chars, default_width, default_height;
   gboolean resizable;
 
   width_chars = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (width_chars_spin));
index afe871414e621422c8cfdd49513d1b069d3b4540..34a833538ba6fb50ee5fe9e6ce0e2c9a4f5c1e5d 100644 (file)
@@ -21,7 +21,7 @@
 #include <string.h>
 
 GtkTreeStore *base_model;
-static gint node_count = 0;
+static int node_count = 0;
 
 static void
 selection_changed (GtkTreeSelection *selection,
@@ -36,7 +36,7 @@ selection_changed (GtkTreeSelection *selection,
 static void
 node_set (GtkTreeIter *iter)
 {
-  gint n;
+  int n;
   gchar *str;
 
   str = g_strdup_printf ("Row (<span color=\"red\">%d</span>)", node_count++);
@@ -290,7 +290,7 @@ quit_cb (GtkWidget *widget,
 }
 
 static void
-make_window (gint view_type)
+make_window (int view_type)
 {
   GtkWidget *window;
   GtkWidget *vbox;
index 512ab7a66f229325aadeef616c7849b082fb342a..cc59a9525abd801dde6517104b4e11170c41e7df 100644 (file)
@@ -152,7 +152,7 @@ static void
 adjust_clock_for_phase (gint64 frame_clock_time,
                         gint64 presentation_time)
 {
-  static gint count = 0;
+  static int count = 0;
   static gint64 previous_frame_clock_time;
   static gint64 previous_presentation_time;
   gint64 phase = presentation_time - frame_clock_time;
index f77a9bc152be776ca47f889975598061d679b998..5beed2cf33918d03696610a87b2f7a4ba6573ff1 100644 (file)
@@ -240,7 +240,7 @@ dump_attribute_set (GString         *string,
     }
 }
 
-static gint
+static int
 compare_attr (gconstpointer a, gconstpointer b)
 {
   const AtkAttribute *aattr = a;
@@ -251,7 +251,7 @@ compare_attr (gconstpointer a, gconstpointer b)
 
 static void
 dump_text_attributes (GString         *string,
-                      gint             depth,
+                      int              depth,
                       const gchar     *name,
                       AtkAttributeSet *attributes)
 {
@@ -335,7 +335,7 @@ dump_atk_text (AtkText *atk_text,
                GString *string)
 {
   gchar *text;
-  gint i, start, end;
+  int i, start, end;
 
   g_string_append_printf (string, "%*s<AtkText>\n", depth, "");
 
@@ -363,7 +363,7 @@ dump_atk_image (AtkImage *atk_image,
                 guint     depth,
                 GString  *string)
 {
-  gint width, height;
+  int width, height;
 
   g_string_append_printf (string, "%*s<AtkImage>\n", depth, "");
 
@@ -378,7 +378,7 @@ dump_atk_action (AtkAction *atk_action,
                  guint      depth,
                  GString   *string)
 {
-  gint i;
+  int i;
 
   g_string_append_printf (string, "%*s<AtkAction>\n", depth, "");
 
@@ -399,7 +399,7 @@ dump_atk_selection (AtkSelection *atk_selection,
                     GString      *string)
 {
   guint n_selections, n_counted_selections;
-  gint i;
+  int i;
 
   g_string_append_printf (string, "%*s<AtkSelection>\n", depth, "");
 
@@ -474,7 +474,7 @@ dump_atk_hyperlink (AtkHyperlink *link,
                     guint         depth,
                     GString      *string)
 {
-  gint i;
+  int i;
 
   g_string_append_printf (string, "%*s<AtkHyperlink>\n", depth, "");
   g_string_append_printf (string, "%*sstart index: %d\n", depth, "", atk_hyperlink_get_start_index (link));
@@ -512,7 +512,7 @@ dump_atk_hypertext (AtkHypertext *hypertext,
                     guint         depth,
                     GString      *string)
 {
-  gint i;
+  int i;
   AtkHyperlink *link;
 
   g_string_append_printf (string, "%*s<AtkHypertext>\n", depth, "");
@@ -529,7 +529,7 @@ dump_atk_streamable_content (AtkStreamableContent *content,
                              guint                 depth,
                              GString              *string)
 {
-  gint i;
+  int i;
 
   g_string_append_printf (string, "%*s<AtkStreamableContent>\n", depth, "");
 
@@ -544,9 +544,9 @@ dump_atk_table (AtkTable *table,
                 guint     depth,
                 GString  *string)
 {
-  gint *selected;
-  gint n_selected;
-  gint i, j;
+  int *selected;
+  int n_selected;
+  int i, j;
   AtkObject *obj;
   const gchar *desc;
 
@@ -634,10 +634,10 @@ dump_atk_table_cell (AtkTableCell *table_cell,
                      guint     depth,
                      GString  *string)
 {
-  gint i;
+  int i;
   AtkObject *obj;
   GPtrArray *cells;
-  gint row = -1, column = -1;
+  int row = -1, column = -1;
 
   g_string_append_printf (string, "%*s<AtkTableCell>\n", depth, "");
 
index 1349b61218951bf4135ed468e213929a92b962bf..cb370f90012a623be3b5fd5c3d198979f6ef427d 100644 (file)
@@ -49,9 +49,9 @@ test_scrolled_window_child_count (void)
 }
 
 typedef struct {
-  gint count;
-  gint index;
-  gint n_children;
+  int count;
+  int index;
+  int n_children;
   gpointer parent;
 } SignalData;
 
@@ -68,7 +68,7 @@ children_changed (AtkObject  *accessible,
 
 static void
 remove_child (STATE *state,
-              gint i)
+              int i)
 {
   GtkWidget *child;
 
@@ -109,7 +109,7 @@ parent_notify (AtkObject *obj, GParamSpec *pspec, SignalData *data)
 }
 
 static gboolean
-do_create_child (STATE *state, gint i)
+do_create_child (STATE *state, int i)
 {
   if (GTK_IS_ENTRY (state->widget))
     {
@@ -143,8 +143,8 @@ test_add_remove (GtkWidget *widget)
   SignalData remove_data;
   SignalData parent_data[3] = { { 0, }, };
   STATE state;
-  gint i, j;
-  gint step_children;
+  int i, j;
+  int step_children;
 
   state.widget = widget;
   accessible = gtk_widget_get_accessible (widget);
index 3a11c8bee276a60faf72b19a8ca31946ed0bee4e..98c055c7232def9e37dd4c98b6c15aab8f985dbf 100644 (file)
@@ -36,7 +36,7 @@ record_state_change (AtkObject   *accessible,
 
   if (states)
     {
-      gint i;
+      int i;
 
       for (i = 0; states[i]; i++)
         {
@@ -66,8 +66,8 @@ static void
 do_action (GtkBuilder *builder, const gchar *action, GString *string)
 {
   gchar **parts;
-  gint len;
-  gint i;
+  int len;
+  int i;
 
   parts = g_strsplit (action, " ", 0);
   len = g_strv_length (parts);
@@ -142,7 +142,7 @@ record_events (const gchar *ui_file,
   GError *error;
   gchar *contents;
   gchar **actions;
-  gint i, len;
+  int i, len;
 
   builder = gtk_builder_new ();
   error = NULL;
index fc5ac70cc39d4552a4ed7740d3de9bdc441a12bf..c78a24061dcff5ca21bd233ba333e95c3700fe72 100644 (file)
@@ -74,7 +74,7 @@ test_basic (GtkWidget *widget)
   AtkText *atk_text;
   const gchar *text = "Text goes here";
   gchar *ret;
-  gint count;
+  int count;
   gunichar c;
 
   atk_text = ATK_TEXT (gtk_widget_get_accessible (widget));
@@ -103,13 +103,13 @@ test_basic (GtkWidget *widget)
 }
 
 typedef struct {
-  gint count;
-  gint position;
-  gint length;
+  int count;
+  int position;
+  int length;
 } SignalData;
 
 static void
-text_deleted (AtkText *atk_text, gint position, gint length, SignalData *data)
+text_deleted (AtkText *atk_text, int position, int length, SignalData *data)
 {
   data->count++;
   data->position = position;
@@ -117,7 +117,7 @@ text_deleted (AtkText *atk_text, gint position, gint length, SignalData *data)
 }
 
 static void
-text_inserted (AtkText *atk_text, gint position, gint length, SignalData *data)
+text_inserted (AtkText *atk_text, int position, int length, SignalData *data)
 {
   data->count++;
   data->position = position;
@@ -195,11 +195,11 @@ test_text_changed (GtkWidget *widget)
 }
 
 typedef struct {
-  gint gravity;
-  gint offset;
+  int gravity;
+  int offset;
   AtkTextBoundary boundary;
-  gint start;
-  gint end;
+  int start;
+  int end;
   const gchar *word;
 } Word;
 
@@ -221,7 +221,7 @@ boundary (AtkTextBoundary b)
 }
 
 static const gchar *
-gravity (gint g)
+gravity (int g)
 {
   if (g < 0) return "before";
   else if (g > 0) return "after";
@@ -271,11 +271,11 @@ static void
 show_text_attributes (PangoLayout *l)
 {
   const PangoLogAttr *attr;
-  gint n_attrs;
+  int n_attrs;
   const gchar *s;
   gchar e;
   const gchar *p;
-  gint i;
+  int i;
   const gchar *text;
   GSList *lines, *li;
   glong so, eo;
@@ -830,9 +830,9 @@ test_words (GtkWidget *widget)
     {  1, 20, ATK_TEXT_BOUNDARY_LINE_END,       20, 20, "" },
     {  0, -1, }
   };
-  gint start, end;
+  int start, end;
   gchar *word;
-  gint i;
+  int i;
 
   atk_text = ATK_TEXT (gtk_widget_get_accessible (widget));
 
@@ -847,7 +847,7 @@ test_words (GtkWidget *widget)
 #ifdef DUMP_RESULTS
   for (i = -1; i <= 1; i++)
     {
-      gint j, k;
+      int j, k;
       for (j = ATK_TEXT_BOUNDARY_CHAR; j <= ATK_TEXT_BOUNDARY_LINE_END; j++)
         for (k = 0; k <= strlen (text); k++)
           {
@@ -918,8 +918,8 @@ test_words (GtkWidget *widget)
 
 static void
 select_region (GtkWidget *widget,
-               gint       start,
-               gint       end)
+               int        start,
+               int        end)
 {
   if (GTK_IS_EDITABLE (widget))
     gtk_editable_select_region (GTK_EDITABLE (widget), start, end);
@@ -940,13 +940,13 @@ select_region (GtkWidget *widget,
 }
 
 typedef struct {
-  gint count;
-  gint position;
-  gint bound;
+  int count;
+  int position;
+  int bound;
 } SelectionData;
 
 static void
-caret_moved_cb (AtkText *text, gint position, SelectionData *data)
+caret_moved_cb (AtkText *text, int position, SelectionData *data)
 {
   data->count++;
   data->position = position;
@@ -965,9 +965,9 @@ test_selection (GtkWidget *widget)
 {
   AtkText *atk_text;
   const gchar *text = "Bla bla bla";
-  gint n;
+  int n;
   gchar *ret;
-  gint start, end;
+  int start, end;
   SelectionData data1;
   SelectionData data2;
 
index b28f7a3d0d67807e9139f61b30001ea887a6d579..e86bb9f97b98da920b0e2bb741fb09a804895b39 100644 (file)
@@ -89,8 +89,8 @@ static void
 walk_accessible_tree (AtkObject *accessible,
                       gpointer   data)
 {
-  gint *count = data;
-  gint i;
+  int *count = data;
+  int i;
 
   (*count)++;
 
@@ -130,7 +130,7 @@ populate_list (GtkBuilder *builder)
   GtkTreeView *tv;
   GtkListStore *store;
   GtkTreeIter iter;
-  gint i;
+  int i;
 
   tv = (GtkTreeView *)gtk_builder_get_object (builder, "treeview1");
   store = (GtkListStore *)gtk_tree_view_get_model (tv);
@@ -175,8 +175,8 @@ test_a11y_performance_list (void)
   gdouble elapsed;
   GtkWidget *window;
   GError *error = NULL;
-  gint count_before;
-  gint count_after;
+  int count_before;
+  int count_after;
 
   builder = gtk_builder_new ();
   gtk_builder_add_from_string (builder, list_ui, -1, &error);
@@ -271,7 +271,7 @@ populate_tree (GtkBuilder *builder)
   GtkTreeView *tv;
   GtkTreeStore *store;
   GtkTreeIter iter;
-  gint i;
+  int i;
 
   tv = (GtkTreeView *)gtk_builder_get_object (builder, "treeview1");
   store = (GtkTreeStore *)gtk_tree_view_get_model (tv);
@@ -322,8 +322,8 @@ test_a11y_performance_tree (void)
   gdouble elapsed;
   GtkWidget *window;
   GError *error = NULL;
-  gint count_before;
-  gint count_after;
+  int count_before;
+  int count_after;
 
   builder = gtk_builder_new ();
   gtk_builder_add_from_string (builder, tree_ui, -1, &error);
index f24d70e643a41970393da372e6614fa2e9b32da9..82d15fb3cd63b5be5fce1ae059eecc001a17932f 100644 (file)
@@ -192,7 +192,7 @@ populate_tree (GtkBuilder *builder)
 }
 
 typedef struct {
-  gint count;
+  int count;
   AtkObject *descendant;
 } SignalData;
 
index df94c5b0d02aed4c70d9b0d9e084291522e7682f..bedf4d3e477c43062cccb8a1bf0d83a81a7e0fc0 100644 (file)
@@ -24,7 +24,7 @@
 
 static void
 set_value (GtkWidget   *widget,
-           gint value)
+           int value)
 {
   if (GTK_IS_LEVEL_BAR (widget))
     gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), value);
@@ -42,7 +42,7 @@ set_value (GtkWidget   *widget,
 
 typedef struct
 {
-  gint count;
+  int count;
   gchar *last_name;
 } NotifyData;
 
index 0666e26218c0263398b01f7eaf7a03390e95ef41..9a4be26be281d6e1b77fdee6c4179d0074a30a8d 100644 (file)
@@ -14,11 +14,11 @@ test_to_text_list (void)
   if (GDK_IS_X11_DISPLAY (display))
     {
       const char *encoding;
-      gint format;
+      int format;
       const guchar *text;
-      gint length;
+      int length;
       gchar **list;
-      gint n;
+      int n;
 
       encoding = g_intern_string ("UTF8_STRING");
       format = 8;
index dc94faec2302ab32e86a467618b2b670df5c0a7e..b7bd8d1670c8e302c0b62bd5158084352777caef 100644 (file)
@@ -18,7 +18,7 @@ test_keysyms_basic (void)
     { GDK_KEY_MonBrightnessUp, "MonBrightnessUp", NULL },
     { 0, NULL }
   };
-  gint i;
+  int i;
 
  for (i = 0; tests[i].keyval != 0; i++)
    {
index 5f61b8c079a0878bee9c33fc2517a6cdbb88b523..381d61aac7be5c2942231125d018db805071ec12 100644 (file)
@@ -51,8 +51,8 @@ compare_textures (GdkTexture *expected,
                   gboolean    ignore_alpha)
 {
   guchar *expected_data, *test_data;
-  gint width, height;
-  gint x, y;
+  int width, height;
+  int x, y;
 
   g_assert_cmpint (gdk_texture_get_width (expected), ==, gdk_texture_get_width (test));
   g_assert_cmpint (gdk_texture_get_height (expected), ==, gdk_texture_get_height (test));
index 598408a58eb680580aa80bf871fa172237fad14d..dc6c41a7421941e3f8907b91a1c7277b31810d87 100644 (file)
@@ -50,8 +50,8 @@ test_basic (void)
   g_object_unref (a);
 }
 
-static gint changed_count;
-static gint value_changed_count;
+static int changed_count;
+static int value_changed_count;
 
 static void
 changed_cb (GtkAdjustment *a)
index 18b29e2078fbf88454fac6ec5256abdea10f8300..b6da2dfbefb2adb5ecfbe81efe01e9b2a41f7d66 100644 (file)
@@ -1880,7 +1880,7 @@ test_add_objects (void)
 {
   GtkBuilder *builder;
   GError *error;
-  gint ret;
+  int ret;
   GObject *obj;
   const gchar *objects[2] = {"mainbox", NULL};
   const gchar *objects2[3] = {"mainbox", "window2", NULL};
index 814e3c0809460624cb3879771f7f8dab5bce9e7e..1f03c4f3d309718fa4e4e62597045f8f791194cc 100644 (file)
 
 #include <gtk/gtk.h>
 
-static gint serial = 0;
+static int serial = 0;
 
 typedef struct {
-  gint serial;
-  gint count;
-  gint start;
-  gint end;
+  int serial;
+  int count;
+  int start;
+  int end;
   gchar *text;
   gchar *new_text;
-  gint position;
-  gint length;
+  int position;
+  int length;
 } EntryData;
 
 static void
@@ -49,8 +49,8 @@ notify (GtkEditable *editable, GParamSpec *pspec, EntryData *data)
 static void
 insert_text (GtkEditable *editable,
              const gchar *new_text,
-             gint         new_text_length,
-             gint        *position,
+             int          new_text_length,
+             int         *position,
              EntryData   *data)
 {
   data->serial = serial++;
@@ -71,8 +71,8 @@ insert_text (GtkEditable *editable,
 
 static void
 delete_text (GtkEditable *editable,
-             gint         start_pos,
-             gint         end_pos,
+             int          start_pos,
+             int          end_pos,
              EntryData   *data)
 {
   data->serial = serial++;
@@ -111,7 +111,7 @@ static void
 test_insert (void)
 {
   GtkWidget *entry;
-  gint pos;
+  int pos;
   EntryData data1;
   EntryData data2;
   EntryData data3;
@@ -213,7 +213,7 @@ static void
 test_delete (void)
 {
   GtkWidget *entry;
-  gint pos;
+  int pos;
   EntryData data1;
   EntryData data2;
   EntryData data3;
index 5b03a93cf2bb12b8091feaa2e24d4fffcaa17c09..9e9916744c03fb6eea03ac940db5ff8e3e60c615 100644 (file)
@@ -4644,7 +4644,7 @@ specific_append_after_collapse_visible_func (GtkTreeModel *model,
                                              GtkTreeIter  *iter,
                                              gpointer      data)
 {
-  gint number;
+  int number;
   gboolean hide_negative_numbers;
 
   gtk_tree_model_get (model, iter, 1, &number, -1);
@@ -4746,7 +4746,7 @@ specific_append_after_collapse (void)
 }
 
 
-static gint
+static int
 specific_sort_filter_remove_node_compare_func (GtkTreeModel  *model,
                                                GtkTreeIter   *iter1,
                                                GtkTreeIter   *iter2,
index b9ab90b3e89f8abeb16235d6623d1f7870614395..6e0234e6582e9197c13b6a3eea19786c08d166cf 100644 (file)
@@ -5,8 +5,8 @@
 
 typedef struct {
   GtkWidget *widget;
-  gint x;
-  gint y;
+  int x;
+  int y;
   guint state;
   guint pressed : 1;
 } PointState;
@@ -247,7 +247,7 @@ typedef struct {
 } GestureData;
 
 static void
-press_cb (GtkGesture *g, gint n_press, gdouble x, gdouble y, gpointer data)
+press_cb (GtkGesture *g, int n_press, gdouble x, gdouble y, gpointer data)
 {
   GtkEventController *c = GTK_EVENT_CONTROLLER (g);
   GdkEventSequence *sequence;
index cfb2a3d82c77d59a986735741df6c5597734d887..42cfc90f872ba482e5283cd26f705e55ff1c19f6 100644 (file)
@@ -25,7 +25,7 @@ test_attach (void)
 {
   GtkGrid *g;
   GtkWidget *child, *sibling, *z, *A, *B;
-  gint left, top, width, height;
+  int left, top, width, height;
 
   g = (GtkGrid *)gtk_grid_new ();
 
index de84b27994d85cff02e6ef6bcd6793ff8064745a..58d7f05738ea5476353d4a2ba0ead0fbd3821ca9 100644 (file)
@@ -232,7 +232,7 @@ gtk_tree_model_ref_count_dump (GtkTreeModelRefCount *ref_model)
 static gboolean
 check_iter (GtkTreeModelRefCount *ref_model,
             GtkTreeIter          *iter,
-            gint                  expected_ref_count,
+            int                   expected_ref_count,
             gboolean              may_assert)
 {
   NodeInfo *info;
@@ -267,7 +267,7 @@ check_iter (GtkTreeModelRefCount *ref_model,
 gboolean
 gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
                                       GtkTreeIter          *parent,
-                                      gint                  expected_ref_count,
+                                      int                   expected_ref_count,
                                       gboolean              recurse,
                                       gboolean              may_assert)
 {
@@ -299,7 +299,7 @@ gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
 gboolean
 gtk_tree_model_ref_count_check_node (GtkTreeModelRefCount *ref_model,
                                      GtkTreeIter          *iter,
-                                     gint                  expected_ref_count,
+                                     int                   expected_ref_count,
                                      gboolean              may_assert)
 {
   return check_iter (ref_model, iter, expected_ref_count, may_assert);
index a4b4011a24fe84062ef65cdce25636f2cfd447d6..019f166478748d3a4f3dee9e7027cd85a92b3185 100644 (file)
@@ -54,12 +54,12 @@ GtkTreeModel *gtk_tree_model_ref_count_new         (void);
 void          gtk_tree_model_ref_count_dump        (GtkTreeModelRefCount *ref_model);
 gboolean      gtk_tree_model_ref_count_check_level (GtkTreeModelRefCount *ref_model,
                                                     GtkTreeIter          *parent,
-                                                    gint                  expected_ref_count,
+                                                    int                   expected_ref_count,
                                                     gboolean              recurse,
                                                     gboolean              may_assert);
 gboolean      gtk_tree_model_ref_count_check_node  (GtkTreeModelRefCount *ref_model,
                                                     GtkTreeIter          *iter,
-                                                    gint                  expected_ref_count,
+                                                    int                   expected_ref_count,
                                                     gboolean              may_assert);
 
 /* A couple of helpers for the tests.  Since this model will never be used
@@ -88,14 +88,14 @@ assert_level_unreferenced (GtkTreeModelRefCount *ref_model,
 
 static inline void
 assert_entire_model_referenced (GtkTreeModelRefCount *ref_model,
-                                gint                  ref_count)
+                                int                   ref_count)
 {
   gtk_tree_model_ref_count_check_level (ref_model, NULL, ref_count, TRUE, TRUE);
 }
 
 static inline void
 assert_not_entire_model_referenced (GtkTreeModelRefCount *ref_model,
-                                    gint                  ref_count)
+                                    int                   ref_count)
 {
   g_assert_cmpint (gtk_tree_model_ref_count_check_level (ref_model, NULL,
                                                          ref_count,
@@ -105,7 +105,7 @@ assert_not_entire_model_referenced (GtkTreeModelRefCount *ref_model,
 
 static inline void
 assert_root_level_referenced (GtkTreeModelRefCount *ref_model,
-                              gint                  ref_count)
+                              int                   ref_count)
 {
   gtk_tree_model_ref_count_check_level (ref_model, NULL, ref_count,
                                         FALSE, TRUE);
@@ -113,7 +113,7 @@ assert_root_level_referenced (GtkTreeModelRefCount *ref_model,
 
 static inline void
 assert_level_referenced (GtkTreeModelRefCount *ref_model,
-                         gint                  ref_count,
+                         int                   ref_count,
                          GtkTreeIter          *iter)
 {
   gtk_tree_model_ref_count_check_level (ref_model, iter, ref_count,
@@ -123,7 +123,7 @@ assert_level_referenced (GtkTreeModelRefCount *ref_model,
 static inline void
 assert_node_ref_count (GtkTreeModelRefCount *ref_model,
                        GtkTreeIter          *iter,
-                       gint                  ref_count)
+                       int                   ref_count)
 {
   gtk_tree_model_ref_count_check_node (ref_model, iter, ref_count, TRUE);
 }
index a343c75735cf4b9891bd599c6b76b5dac6479b2f..b6387ce9d9b6c43d78062ef44a9b9ffbb57c3add 100644 (file)
@@ -50,12 +50,12 @@ lookup_flags_to_string (GtkIconLookupFlags flags)
 
 static void
 assert_icon_lookup_size (const char         *icon_name,
-                         gint                size,
+                         int                 size,
                          GtkTextDirection    direction,
                          GtkIconLookupFlags  flags,
                          gboolean            fallbacks,
                          const char         *filename,
-                         gint                pixbuf_size)
+                         int                 pixbuf_size)
 {
   GtkIconPaintable *info;
   GFile *file;
@@ -111,7 +111,7 @@ assert_icon_lookup_size (const char         *icon_name,
 
 static void
 assert_icon_lookup (const char         *icon_name,
-                    gint                size,
+                    int                 size,
                     GtkTextDirection    direction,
                     GtkIconLookupFlags  flags,
                     gboolean            fallbacks,
@@ -122,7 +122,7 @@ assert_icon_lookup (const char         *icon_name,
 
 static void
 assert_icon_lookup_fails (const char         *icon_name,
-                          gint                size,
+                          int                 size,
                           GtkTextDirection    direction,
                           GtkIconLookupFlags  flags)
 {
@@ -170,7 +170,7 @@ log_writer (GLogLevelFlags   log_level,
 
 static void
 assert_lookup_order (const char         *icon_name,
-                     gint                size,
+                     int                 size,
                      GtkTextDirection    direction,
                      GtkIconLookupFlags  flags,
                      gboolean            fallbacks,
@@ -734,7 +734,7 @@ test_inherit (void)
 static void
 test_nonsquare_symbolic (void)
 {
-  gint width, height, size;
+  int width, height, size;
   GtkIconTheme *icon_theme;
   GtkIconPaintable *info;
   GFile *file;
index 88b24108ebe965e5412c5d60c599f157ba9cf605..43c24436515e469c40dd3bf0e79995d942cb3976 100644 (file)
@@ -1,13 +1,13 @@
 #include <gtk/gtk.h>
 
-static gint
+static int
 sort_list (GtkListBoxRow *row1,
            GtkListBoxRow *row2,
            gpointer       data)
 {
   GtkWidget *label1, *label2;
-  gint n1, n2;
-  gint *count = data;
+  int n1, n2;
+  int *count = data;
 
   (*count)++;
 
@@ -51,9 +51,9 @@ test_sort (void)
   GtkListBox *list;
   GtkListBoxRow *row;
   GtkWidget *label;
-  gint i, r;
+  int i, r;
   gchar *s;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -94,7 +94,7 @@ on_row_selected (GtkListBox    *list_box,
                  GtkListBoxRow *row,
                  gpointer       data)
 {
-  gint *i = data;
+  int *i = data;
 
   (*i)++;
 
@@ -107,10 +107,10 @@ test_selection (void)
   GtkListBox *list;
   GtkListBoxRow *row, *row2;
   GtkWidget *label;
-  gint i;
+  int i;
   gchar *s;
-  gint count;
-  gint index;
+  int count;
+  int index;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -184,7 +184,7 @@ test_selection (void)
 static void
 on_selected_rows_changed (GtkListBox *box, gpointer data)
 {
-  gint *i = data;
+  int *i = data;
 
   (*i)++;
 }
@@ -196,9 +196,9 @@ test_multi_selection (void)
   GList *l;
   GtkListBoxRow *row, *row2;
   GtkWidget *label;
-  gint i;
+  int i;
   gchar *s;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -272,9 +272,9 @@ static gboolean
 filter_func (GtkListBoxRow *row,
              gpointer       data)
 {
-  gint *count = data;
+  int *count = data;
   GtkWidget *child;
-  gint i;
+  int i;
 
   (*count)++;
 
@@ -287,7 +287,7 @@ filter_func (GtkListBoxRow *row,
 static void
 check_filtered (GtkListBox *list)
 {
-  gint count;
+  int count;
   GtkWidget *row;
 
   count = 0;
@@ -309,10 +309,10 @@ test_filter (void)
 {
   GtkListBox *list;
   GtkListBoxRow *row;
-  gint i;
+  int i;
   gchar *s;
   GtkWidget *label;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
@@ -354,8 +354,8 @@ header_func (GtkListBoxRow *row,
              gpointer       data)
 {
   GtkWidget *child;
-  gint i;
-  gint *count = data;
+  int i;
+  int *count = data;
   GtkWidget *header;
   gchar *s;
 
@@ -379,7 +379,7 @@ header_func (GtkListBoxRow *row,
 static void
 check_headers (GtkListBox *list)
 {
-  gint count;
+  int count;
   GtkWidget *row;
 
   count = 0;
@@ -401,10 +401,10 @@ test_header (void)
 {
   GtkListBox *list;
   GtkListBoxRow *row;
-  gint i;
+  int i;
   gchar *s;
   GtkWidget *label;
-  gint count;
+  int count;
 
   list = GTK_LIST_BOX (gtk_list_box_new ());
   g_object_ref_sink (list);
index 4455a13dffee05c0b16f177aac437d5a485379cf..0bf77f68905e92d54c753e1152a8548ff71eecc4 100644 (file)
@@ -99,8 +99,8 @@ list_store_teardown (ListStore     *fixture,
 
 static void
 check_model (ListStore *fixture,
-            gint      *new_order,
-            gint       skip)
+            int       *new_order,
+            int        skip)
 {
   int i;
   GtkTreePath *path;
index ddd806948db973d3a9fec89338355477f488db3e..ed2076455fb0c5e17156d313573f96f17f8d55be 100644 (file)
@@ -41,7 +41,7 @@ assert_notifies (GObject    *object,
 typedef struct
 {
   const gchar *name;
-  gint count;
+  int count;
 } NotifyData;
 
 static void
@@ -64,12 +64,12 @@ check_property (GObject *instance, GParamSpec *pspec)
   if (G_TYPE_IS_ENUM (pspec->value_type))
     {
       GEnumClass *class;
-      gint i;
+      int i;
       NotifyData data;
       gulong id;
-      gint first;
-      gint value;
-      gint current_count;
+      int first;
+      int value;
+      int current_count;
 
       class = g_type_class_ref (pspec->value_type);
 
@@ -103,11 +103,11 @@ check_property (GObject *instance, GParamSpec *pspec)
   else if (G_TYPE_IS_FLAGS (pspec->value_type))
     {
       GFlagsClass *class;
-      gint i;
+      int i;
       NotifyData data;
       gulong id;
       guint value;
-      gint current_count;
+      int current_count;
 
       class = g_type_class_ref (pspec->value_type);
 
@@ -165,11 +165,11 @@ check_property (GObject *instance, GParamSpec *pspec)
   else if (pspec->value_type == G_TYPE_INT)
     {
       GParamSpecInt *p = G_PARAM_SPEC_INT (pspec);
-      gint i;
+      int i;
       NotifyData data;
       gulong id;
-      gint value;
-      gint current_count;
+      int value;
+      int current_count;
 
       data.name = pspec->name;
       data.count = 0;
@@ -202,7 +202,7 @@ check_property (GObject *instance, GParamSpec *pspec)
       NotifyData data;
       gulong id;
       guint value;
-      gint current_count;
+      int current_count;
       guint minimum, maximum;
 
       if (G_IS_PARAM_SPEC_UINT (pspec))
@@ -274,7 +274,7 @@ check_property (GObject *instance, GParamSpec *pspec)
       gulong id;
       gdouble value;
       gdouble new_value;
-      gint current_count;
+      int current_count;
       gdouble delta;
 
       data.name = pspec->name;
@@ -315,7 +315,7 @@ check_property (GObject *instance, GParamSpec *pspec)
       gulong id;
       gfloat value;
       gfloat new_value;
-      gint current_count;
+      int current_count;
 
       data.name = pspec->name;
       data.count = 0;
@@ -678,7 +678,7 @@ main (int argc, char **argv)
 {
   const GType *otypes;
   guint i;
-  gint result;
+  int result;
 
   gtk_test_init (&argc, &argv);
   gtk_test_register_all_types();
index e46f404424a97d182507801164e10915f1b66375..17bebfd9c889c1caf07f4c07b14b4572566a6e53 100644 (file)
@@ -129,7 +129,7 @@ main (int argc, char **argv)
 {
   const GType *all_types;
   guint n_types = 0, i;
-  gint result;
+  int result;
   const char *display, *x_r_d;
 
   /* These must be set before gtk_test_init */
index 0975c47d51adfbef814174aca505566fce188410..b40ae6eb4ca8c25b87c66b3291e390b78e64a6ed 100644 (file)
@@ -61,11 +61,11 @@ count_total (GtkTreeRBTree *tree,
   return res;
 }
 
-static gint
+static int
 _count_nodes (GtkTreeRBTree *tree,
               GtkTreeRBNode *node)
 {
-  gint res;
+  int res;
   if (gtk_tree_rbtree_is_nil (node))
     return 0;
 
@@ -84,7 +84,7 @@ static void
 gtk_tree_rbtree_test_height (GtkTreeRBTree *tree,
                              GtkTreeRBNode *node)
 {
-  gint computed_offset = 0;
+  int computed_offset = 0;
 
   /* This whole test is sort of a useless truism. */
 
@@ -113,7 +113,7 @@ gtk_tree_rbtree_test_height (GtkTreeRBTree *tree,
 static void
 gtk_tree_rbtree_test_dirty (GtkTreeRBTree *tree,
                             GtkTreeRBNode *node,
-                            gint           expected_dirtyness)
+                            int            expected_dirtyness)
 {
   g_assert (node);
 
@@ -230,9 +230,9 @@ gtk_tree_rbtree_test (GtkTreeRBTree *tree)
 static void
 gtk_rbtree_print_node (GtkTreeRBTree *tree,
                        GtkTreeRBNode *node,
-                       gint           depth)
+                       int            depth)
 {
-  gint i;
+  int i;
   for (i = 0; i < depth; i++)
     g_print ("\t");
 
@@ -429,13 +429,13 @@ test_remove_root (void)
   gtk_tree_rbtree_free (tree);
 }
 
-static gint *
+static int *
 fisher_yates_shuffle (guint n_items)
 {
-  gint *list;
+  int *list;
   guint i, j;
 
-  list = g_new (gint, n_items);
+  list = g_new (int, n_items);
 
   for (i = 0; i < n_items; i++)
     {
@@ -448,7 +448,7 @@ fisher_yates_shuffle (guint n_items)
 }
 
 static GtkTreeRBTree *
-create_unsorted_tree (gint *order,
+create_unsorted_tree (int *order,
                       guint n)
 {
   GtkTreeRBTree *tree;
@@ -480,7 +480,7 @@ test_reorder (void)
   guint n = g_test_perf () ? 1000000 : 100;
   GtkTreeRBTree *tree;
   GtkTreeRBNode *node;
-  gint *reorder;
+  int *reorder;
   guint i;
   double elapsed;
 
index 8173b3f00bbc36a13d94b09d62546dd551d92e73..9594c9fe1ad861171db2c6cf730fde661892d5ea 100644 (file)
@@ -101,7 +101,7 @@ recent_manager_add (void)
 typedef struct {
   GtkRecentManager *manager;
   GMainLoop *main_loop;
-  gint counter;
+  int counter;
 } AddManyClosure;
 
 static void
@@ -284,7 +284,7 @@ recent_manager_purge (void)
 {
   GtkRecentManager *manager;
   GtkRecentData *recent_data;
-  gint n;
+  int n;
   GError *error;
 
   manager = gtk_recent_manager_get_default ();
index ace411e944ec392eb1f9eca7d33a5bc5da98a421..e8e35d92272b5fc16aa926f4fd9f7465c0396307 100644 (file)
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-static gint value_changed_count;
+static int value_changed_count;
 
 static void
 value_changed_cb (GtkSpinButton *spin)
@@ -37,7 +37,7 @@ test_value_changed (void)
   g_assert_cmpint (value_changed_count, ==, 5);
 }
 
-static gint adjustment_changed_count;
+static int adjustment_changed_count;
 
 static void
 adjustment_changed_cb (GObject *object, GParamSpec *pspec)
index 1f2b95ff379de7d5b81bc53feb56951e1ef0b895..7498f2b7895853596f3196830f2235067567fe79 100644 (file)
@@ -90,13 +90,13 @@ check_get_set_text (GtkTextBuffer *buffer,
     g_error ("%d chars, expected 0", n);
 }
 
-static gint
+static int
 count_toggles_at_iter (GtkTextIter *iter,
                        GtkTextTag  *of_tag)
 {
   GSList *tags;
   GSList *tmp;
-  gint count = 0;
+  int count = 0;
   
   /* get toggle-ons and toggle-offs */
   tags = gtk_text_iter_get_toggled_tags (iter, TRUE);
@@ -119,14 +119,14 @@ count_toggles_at_iter (GtkTextIter *iter,
   return count;
 }
 
-static gint
+static int
 count_toggles_in_range_by_char (GtkTextBuffer     *buffer,
                                 GtkTextTag        *of_tag,
                                 const GtkTextIter *start,
                                 const GtkTextIter *end)
 {
   GtkTextIter iter;
-  gint count = 0;
+  int count = 0;
   
   iter = *start;
   do
@@ -144,7 +144,7 @@ count_toggles_in_range_by_char (GtkTextBuffer     *buffer,
   return count;
 }
 
-static gint
+static int
 count_toggles_in_buffer (GtkTextBuffer *buffer,
                          GtkTextTag    *of_tag)
 {
@@ -164,9 +164,9 @@ check_specific_tag_in_range (GtkTextBuffer     *buffer,
   GtkTextIter iter;
   GtkTextTag *tag;
   gboolean state;
-  gint count;
-  gint buffer_count;
-  gint last_offset;
+  int count;
+  int buffer_count;
+  int last_offset;
 
   if (gtk_text_iter_compare (start, end) > 0)
     {
@@ -189,7 +189,7 @@ check_specific_tag_in_range (GtkTextBuffer     *buffer,
     {
       do
         {
-          gint this_offset;
+          int this_offset;
           
           ++count;
 
@@ -233,7 +233,7 @@ check_specific_tag_in_range (GtkTextBuffer     *buffer,
     {
       do
         {
-          gint this_offset;
+          int this_offset;
           
           ++count;
 
@@ -289,13 +289,13 @@ run_tests (GtkTextBuffer *buffer)
   GtkTextIter start;
   GtkTextIter end;
   GtkTextIter mark;
-  gint i, j;
-  gint num_chars;
+  int i, j;
+  int num_chars;
   GtkTextMark *bar_mark;
   GtkTextTag *tag;
   GHashTable *tag_states;
-  gint count;
-  gint buffer_count;
+  int count;
+  int buffer_count;
   
   gtk_text_buffer_get_bounds (buffer, &start, &end);
 
@@ -809,7 +809,7 @@ test_line_separation (const char* str,
   GtkTextBuffer* buffer;
   gboolean on_next_line;
   gboolean on_end_iter;
-  gint new_pos;
+  int new_pos;
 
   buffer = gtk_text_buffer_new (NULL);
 
@@ -1464,7 +1464,7 @@ test_get_iter (void)
 {
   GtkTextBuffer *buffer;
   GtkTextIter iter;
-  gint offset;
+  int offset;
 
   buffer = gtk_text_buffer_new (NULL);
 
index 6f6e14f803fd59e753f2ad7e1ae7613ee41e7d9c..c13e277ca39389db5e4ae4d6b8478c6528f86d3b 100644 (file)
@@ -286,7 +286,7 @@ test_forward_to_tag_toggle (void)
   GtkTextTag *bold_tag;
   GtkTextTag *editable_tag;
   GtkTextIter iter;
-  gint offset;
+  int offset;
 
   buffer = gtk_text_buffer_new (NULL);
 
@@ -332,8 +332,8 @@ test_forward_to_tag_toggle (void)
 
 static void
 check_forward_line_end (const gchar *buffer_text,
-                        gint         initial_offset,
-                        gint         result_offset,
+                        int          initial_offset,
+                        int          result_offset,
                         gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -364,7 +364,7 @@ test_forward_to_line_end (void)
 
 static void
 check_word_boundaries (const gchar *buffer_text,
-                       gint         offset,
+                       int          offset,
                        gboolean     starts_word,
                        gboolean     ends_word,
                        gboolean     inside_word)
@@ -386,8 +386,8 @@ check_word_boundaries (const gchar *buffer_text,
 
 static void
 check_forward_word_end (const gchar *buffer_text,
-                        gint         initial_offset,
-                        gint         result_offset,
+                        int          initial_offset,
+                        int          result_offset,
                         gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -406,8 +406,8 @@ check_forward_word_end (const gchar *buffer_text,
 
 static void
 check_backward_word_start (const gchar *buffer_text,
-                           gint         initial_offset,
-                           gint         result_offset,
+                           int          initial_offset,
+                           int          result_offset,
                            gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -453,8 +453,8 @@ test_word_boundaries (void)
 
 static void
 check_forward_visible_word_end (GtkTextBuffer *buffer,
-                                gint           initial_offset,
-                                gint           result_offset,
+                                int            initial_offset,
+                                int            result_offset,
                                 gboolean       ret)
 {
   GtkTextIter iter;
@@ -467,8 +467,8 @@ check_forward_visible_word_end (GtkTextBuffer *buffer,
 
 static void
 check_backward_visible_word_start (GtkTextBuffer *buffer,
-                                   gint           initial_offset,
-                                   gint           result_offset,
+                                   int            initial_offset,
+                                   int            result_offset,
                                    gboolean       ret)
 {
   GtkTextIter iter;
@@ -536,7 +536,7 @@ test_visible_word_boundaries (void)
 
 static void
 check_is_cursor_position (const gchar *buffer_text,
-                          gint         offset,
+                          int          offset,
                           gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -554,8 +554,8 @@ check_is_cursor_position (const gchar *buffer_text,
 static void
 check_cursor_position (const gchar *buffer_text,
                        gboolean     forward,
-                       gint         initial_offset,
-                       gint         result_offset,
+                       int          initial_offset,
+                       int          result_offset,
                        gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -604,8 +604,8 @@ test_cursor_positions (void)
 static void
 check_visible_cursor_position (GtkTextBuffer *buffer,
                                gboolean       forward,
-                               gint           initial_offset,
-                               gint           result_offset,
+                               int            initial_offset,
+                               int            result_offset,
                                gboolean       ret)
 {
   GtkTextIter iter;
@@ -658,7 +658,7 @@ test_visible_cursor_positions (void)
 
 static void
 check_sentence_boundaries (const gchar *buffer_text,
-                           gint         offset,
+                           int          offset,
                            gboolean     starts_sentence,
                            gboolean     ends_sentence,
                            gboolean     inside_sentence)
@@ -680,8 +680,8 @@ check_sentence_boundaries (const gchar *buffer_text,
 
 static void
 check_forward_sentence_end (const gchar *buffer_text,
-                            gint         initial_offset,
-                            gint         result_offset,
+                            int          initial_offset,
+                            int          result_offset,
                             gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -700,8 +700,8 @@ check_forward_sentence_end (const gchar *buffer_text,
 
 static void
 check_backward_sentence_start (const gchar *buffer_text,
-                               gint         initial_offset,
-                               gint         result_offset,
+                               int          initial_offset,
+                               int          result_offset,
                                gboolean     ret)
 {
   GtkTextBuffer *buffer;
@@ -749,7 +749,7 @@ test_backward_line (void)
   GtkTextBuffer *buffer;
   GtkTextIter iter, start, end;
   gboolean ret;
-  gint offset;
+  int offset;
 
   buffer = gtk_text_buffer_new (NULL);
   gtk_text_buffer_get_start_iter (buffer, &iter);
index 54db6e94eb991b5fa5dd2dab9c09cc09888b97aa..a9ebd0d06d5b481f15b5987d3e08b02b1bf15a7e 100644 (file)
@@ -240,7 +240,7 @@ static void
 signal_monitor_rows_reordered (GtkTreeModel *model,
                                GtkTreePath  *path,
                                GtkTreeIter  *iter,
-                               gint         *new_order,
+                               int          *new_order,
                                gpointer      data)
 {
   signal_monitor_generic_handler (data, ROWS_REORDERED,
index c014de2c5f0dde069772d64b1da532a7a8f1485b..da77bf0a436875914573835f4554e25f7b835119 100644 (file)
@@ -23,8 +23,8 @@ static void
 test_append (void)
 {
   GtkTreePath *p;
-  gint i;
-  gint *indices;
+  int i;
+  int *indices;
 
   p = gtk_tree_path_new ();
   for (i = 0; i < 100; i++)
@@ -44,8 +44,8 @@ static void
 test_prepend (void)
 {
   GtkTreePath *p;
-  gint i;
-  gint *indices;
+  int i;
+  int *indices;
 
   p = gtk_tree_path_new ();
   for (i = 0; i < 100; i++)
@@ -66,9 +66,9 @@ test_to_string (void)
 {
   const gchar *str = "0:1:2:3:4:5:6:7:8:9:10";
   GtkTreePath *p;
-  gint *indices;
+  int *indices;
   gchar *s;
-  gint i;
+  int i;
 
   p = gtk_tree_path_new_from_string (str);
   indices = gtk_tree_path_get_indices (p);
@@ -85,8 +85,8 @@ static void
 test_from_indices (void)
 {
   GtkTreePath *p;
-  gint *indices;
-  gint i;
+  int *indices;
+  int i;
 
   p = gtk_tree_path_new_from_indices (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1);
   g_assert_cmpint (gtk_tree_path_get_depth (p), ==, 10);
@@ -111,9 +111,9 @@ test_navigation (void)
 {
   GtkTreePath *p;
   GtkTreePath *q;
-  gint *pi;
-  gint *qi;
-  gint i;
+  int *pi;
+  int *qi;
+  int i;
   gboolean res;
 
   p = gtk_tree_path_new_from_indices (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1);
index a58ab780f99f7dae7b4c991f3f7f71037d0fa494..af1d651695d622113302c68b51d2cf652d50f1a3 100644 (file)
@@ -102,8 +102,8 @@ tree_store_teardown (TreeStore     *fixture,
 
 static void
 check_model (TreeStore *fixture,
-            gint      *new_order,
-            gint       skip)
+            int       *new_order,
+            int        skip)
 {
   int i;
   GtkTreePath *path;
@@ -1062,7 +1062,7 @@ static void
 specific_bug_698396 (void)
 {
   GtkTreeStore *tree_store;
-  gint new_order[1] = { 0 };
+  int new_order[1] = { 0 };
 
   /*http://bugzilla.gnome.org/show_bug.cgi?id=698396 */
 
index f468ac654289c3d64051dfb5ab662b90b96ed8ad..ddbdf44746b8189850e1ea35a24b64c371c92cf6 100644 (file)
@@ -24,7 +24,7 @@ type_name_mangle (const gchar *name,
                   gboolean     split_first_cap)
 {
   GString *symbol_name = g_string_new ("");
-  gint i;
+  int i;
 
   for (i = 0; name[i] != '\0'; i++)
     {
index c67dfb745b00cf5f1a67c3dc77afa63e7d50e1f4..8ffc0645bfddd570fe85071e5c93674679696825 100644 (file)
@@ -26,7 +26,7 @@ on_draw (GtkDrawingArea *da,
          int             height,
          gpointer        data)
 {
-  gint i, j;
+  int i, j;
 
   for (i = 0; 20 * i < width; i++)
     {
@@ -64,7 +64,7 @@ test_default_size (void)
 {
   GtkWidget *window;
   GtkWidget *da;
-  gint w, h;
+  int w, h;
   gboolean done;
 
   window = gtk_window_new ();
@@ -152,7 +152,7 @@ test_resize (void)
 {
   GtkWidget *window;
   GtkWidget *da;
-  gint w, h;
+  int w, h;
   gboolean done;
 
   window = gtk_window_new ();
@@ -214,7 +214,7 @@ static void
 test_resize_popup (void)
 {
   GtkWidget *window;
-  gint w, h;
+  int w, h;
   gboolean done;
 
   /* testcase for the dnd window */
@@ -244,7 +244,7 @@ static void
 test_show_hide (void)
 {
   GtkWidget *window;
-  gint w, h, w1, h1;
+  int w, h, w1, h1;
   gboolean done;
 
   /*http://bugzilla.gnome.org/show_bug.cgi?id=696882 */
@@ -293,7 +293,7 @@ test_show_hide (void)
 int
 main (int argc, char *argv[])
 {
-  gint i;
+  int i;
 
   gtk_test_init (&argc, &argv);
 
index ff1cf2577eae189e7ebd62abc43d6257435467de..de08c0b0263b1eef61cb6b3a2f1ba3a9da9fb020 100644 (file)
@@ -197,7 +197,7 @@ quit_when_idle (gpointer loop)
   return G_SOURCE_REMOVE;
 }
 
-static gint inhibit_count;
+static int inhibit_count;
 static GMainLoop *loop;
 
 G_MODULE_EXPORT void
index 7a6646393a386713bf993cdf9ac5f7733bc2a879..7db051530fbd24658014320d5c2237526a7b2903 100644 (file)
@@ -20,7 +20,7 @@
 static void
 set_border_window_size (GtkTextView       *text_view,
                         GtkTextWindowType  win,
-                        gint               size)
+                        int                size)
 {
   GtkWidget *label;